提交 061bf3cd 编写于 作者: T Thomas Klein 提交者: Jeff Garzik

ehea: Fixed wrong dereferencation

Not only check the pointer against 0 but also the dereferenced value
Signed-off-by: NThomas Klein <tklein@de.ibm.com>
Signed-off-by: NJeff Garzik <jeff@garzik.org>
上级 9f6d55d0
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
#include <asm/io.h> #include <asm/io.h>
#define DRV_NAME "ehea" #define DRV_NAME "ehea"
#define DRV_VERSION "EHEA_0043" #define DRV_VERSION "EHEA_0044"
#define EHEA_MSG_DEFAULT (NETIF_MSG_LINK | NETIF_MSG_TIMER \ #define EHEA_MSG_DEFAULT (NETIF_MSG_LINK | NETIF_MSG_TIMER \
| NETIF_MSG_RX_ERR | NETIF_MSG_TX_ERR) | NETIF_MSG_RX_ERR | NETIF_MSG_TX_ERR)
......
...@@ -2471,14 +2471,16 @@ static int __devinit ehea_probe(struct ibmebus_dev *dev, ...@@ -2471,14 +2471,16 @@ static int __devinit ehea_probe(struct ibmebus_dev *dev,
adapter_handle = (u64*)get_property(dev->ofdev.node, "ibm,hea-handle", adapter_handle = (u64*)get_property(dev->ofdev.node, "ibm,hea-handle",
NULL); NULL);
if (!adapter_handle) { if (adapter_handle)
adapter->handle = *adapter_handle;
if (!adapter->handle) {
dev_err(&dev->ofdev.dev, "failed getting handle for adapter" dev_err(&dev->ofdev.dev, "failed getting handle for adapter"
" '%s'\n", dev->ofdev.node->full_name); " '%s'\n", dev->ofdev.node->full_name);
ret = -ENODEV; ret = -ENODEV;
goto out_free_ad; goto out_free_ad;
} }
adapter->handle = *adapter_handle;
adapter->pd = EHEA_PD_ID; adapter->pd = EHEA_PD_ID;
dev->ofdev.dev.driver_data = adapter; dev->ofdev.dev.driver_data = adapter;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册