diff --git a/[refs] b/[refs]
index 0e5d6b5c25a6..1e21483fb4d6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d3b8130611bbe50168ad0a12841735c9c235410
+refs/heads/master: c4f5c8521868789caaf704c9c2d523b40ccfcb02
diff --git a/trunk/drivers/net/wireless/wl12xx/main.c b/trunk/drivers/net/wireless/wl12xx/main.c
index c6a454439711..6d27cd687672 100644
--- a/trunk/drivers/net/wireless/wl12xx/main.c
+++ b/trunk/drivers/net/wireless/wl12xx/main.c
@@ -1274,13 +1274,15 @@ static int __devinit wl12xx_probe(struct spi_device *spi)
 	wl->set_power = pdata->set_power;
 	if (!wl->set_power) {
 		wl12xx_error("set power function missing in platform data");
-		return -ENODEV;
+		ret = -ENODEV;
+		goto out_free;
 	}
 
 	wl->irq = spi->irq;
 	if (wl->irq < 0) {
 		wl12xx_error("irq missing in platform data");
-		return -ENODEV;
+		ret = -ENODEV;
+		goto out_free;
 	}
 
 	ret = request_irq(wl->irq, wl12xx_irq, 0, DRIVER_NAME, wl);