aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorKalle Valo <kalle.valo@nokia.com>2009-06-12 07:14:34 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-07-10 14:57:42 -0400
commitc4f5c8521868789caaf704c9c2d523b40ccfcb02 (patch)
tree67d028c02f50a11e1c790a5bdc8130bf271bec73 /drivers/net/wireless
parent1d3b8130611bbe50168ad0a12841735c9c235410 (diff)
wl12xx: fix error handling in wl12xx_probe()
Resources were not freed properly in some cases. Signed-off-by: Kalle Valo <kalle.valo@nokia.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/wl12xx/main.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c
index c6a454439711..6d27cd687672 100644
--- a/drivers/net/wireless/wl12xx/main.c
+++ b/drivers/net/wireless/wl12xx/main.c
@@ -1274,13 +1274,15 @@ static int __devinit wl12xx_probe(struct spi_device *spi)
1274 wl->set_power = pdata->set_power; 1274 wl->set_power = pdata->set_power;
1275 if (!wl->set_power) { 1275 if (!wl->set_power) {
1276 wl12xx_error("set power function missing in platform data"); 1276 wl12xx_error("set power function missing in platform data");
1277 return -ENODEV; 1277 ret = -ENODEV;
1278 goto out_free;
1278 } 1279 }
1279 1280
1280 wl->irq = spi->irq; 1281 wl->irq = spi->irq;
1281 if (wl->irq < 0) { 1282 if (wl->irq < 0) {
1282 wl12xx_error("irq missing in platform data"); 1283 wl12xx_error("irq missing in platform data");
1283 return -ENODEV; 1284 ret = -ENODEV;
1285 goto out_free;
1284 } 1286 }
1285 1287
1286 ret = request_irq(wl->irq, wl12xx_irq, 0, DRIVER_NAME, wl); 1288 ret = request_irq(wl->irq, wl12xx_irq, 0, DRIVER_NAME, wl);