aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/wl1251
diff options
context:
space:
mode:
authorDan Carpenter <error27@gmail.com>2010-12-18 03:52:10 -0500
committerJohn W. Linville <linville@tuxdriver.com>2010-12-20 14:49:49 -0500
commitae29fbb189c7a80677500c718c9ce08095ccde01 (patch)
treef62fb4e57d9dac563976f71599fad3daacc13da2 /drivers/net/wireless/wl1251
parentd704300fa546a613ec3821b908528b20685cb92a (diff)
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>
Diffstat (limited to 'drivers/net/wireless/wl1251')
-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,
252 wl->if_ops = &wl1251_sdio_ops; 252 wl->if_ops = &wl1251_sdio_ops;
253 253
254 wl12xx_board_data = wl12xx_get_platform_data(); 254 wl12xx_board_data = wl12xx_get_platform_data();
255 if (wl12xx_board_data != NULL) { 255 if (!IS_ERR(wl12xx_board_data)) {
256 wl->set_power = wl12xx_board_data->set_power; 256 wl->set_power = wl12xx_board_data->set_power;
257 wl->irq = wl12xx_board_data->irq; 257 wl->irq = wl12xx_board_data->irq;
258 wl->use_eeprom = wl12xx_board_data->use_eeprom; 258 wl->use_eeprom = wl12xx_board_data->use_eeprom;