summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter2010-12-18 09:52:10 +0100
committerJohn W. Linville2010-12-20 20:49:49 +0100
commitae29fbb189c7a80677500c718c9ce08095ccde01 (patch)
treef62fb4e57d9dac563976f71599fad3daacc13da2
parentrtlwifi: Fix use of mutex in interrupt code (diff)
downloadkernel-qcow2-linux-ae29fbb189c7a80677500c718c9ce08095ccde01.tar.gz
kernel-qcow2-linux-ae29fbb189c7a80677500c718c9ce08095ccde01.tar.xz
kernel-qcow2-linux-ae29fbb189c7a80677500c718c9ce08095ccde01.zip
wl1251: wl12xx_get_platform_data() returns an ERR_PTR
wl12xx_get_platform_data() returns an ERR_PTR on failure and it never returns a NULL. Signed-off-by: Dan Carpenter <error27@gmail.com> Acked-by: Kalle Valo <kvalo@adurom.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/wl1251/sdio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl1251/sdio.c b/drivers/net/wireless/wl1251/sdio.c
index 596d90ecba33..d550b5e68d3c 100644
--- a/drivers/net/wireless/wl1251/sdio.c
+++ b/drivers/net/wireless/wl1251/sdio.c
@@ -252,7 +252,7 @@ static int wl1251_sdio_probe(struct sdio_func *func,
wl->if_ops = &wl1251_sdio_ops;
wl12xx_board_data = wl12xx_get_platform_data();
- if (wl12xx_board_data != NULL) {
+ if (!IS_ERR(wl12xx_board_data)) {
wl->set_power = wl12xx_board_data->set_power;
wl->irq = wl12xx_board_data->irq;
wl->use_eeprom = wl12xx_board_data->use_eeprom;