Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 061bf3cd authored by Thomas Klein's avatar Thomas Klein Committed by Jeff Garzik
Browse files

ehea: Fixed wrong dereferencation 



Not only check the pointer against 0 but also the dereferenced value

Signed-off-by: default avatarThomas Klein <tklein@de.ibm.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 9f6d55d0

drivers/net/ehea/ehea.h

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
#include <asm/io.h>



#define DRV_NAME	"ehea"

#define DRV_VERSION	"EHEA_0043"

#define DRV_VERSION	"EHEA_0044"



#define EHEA_MSG_DEFAULT (NETIF_MSG_LINK | NETIF_MSG_TIMER \

	| NETIF_MSG_RX_ERR | NETIF_MSG_TX_ERR)

drivers/net/ehea/ehea_main.c

+4 −2
Original line number Diff line number Diff line
@@ -2471,14 +2471,16 @@ static int __devinit ehea_probe(struct ibmebus_dev *dev, 


	adapter_handle = (u64*)get_property(dev->ofdev.node, "ibm,hea-handle",

					    NULL);

	if (!adapter_handle) {

	if (adapter_handle)

		adapter->handle = *adapter_handle;



	if (!adapter->handle) {

		dev_err(&dev->ofdev.dev, "failed getting handle for adapter"

			" '%s'\n", dev->ofdev.node->full_name);

		ret = -ENODEV;

		goto out_free_ad;

	}



	adapter->handle = *adapter_handle;

	adapter->pd = EHEA_PD_ID;



	dev->ofdev.dev.driver_data = adapter;