diff options
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl1271_spi.c')
-rw-r--r-- | drivers/net/wireless/wl12xx/wl1271_spi.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_spi.c b/drivers/net/wireless/wl12xx/wl1271_spi.c index 4cb99c541e2a..ced0a9e2c7e1 100644 --- a/drivers/net/wireless/wl12xx/wl1271_spi.c +++ b/drivers/net/wireless/wl12xx/wl1271_spi.c | |||
@@ -25,7 +25,7 @@ | |||
25 | #include <linux/module.h> | 25 | #include <linux/module.h> |
26 | #include <linux/crc7.h> | 26 | #include <linux/crc7.h> |
27 | #include <linux/spi/spi.h> | 27 | #include <linux/spi/spi.h> |
28 | #include <linux/spi/wl12xx.h> | 28 | #include <linux/wl12xx.h> |
29 | #include <linux/slab.h> | 29 | #include <linux/slab.h> |
30 | 30 | ||
31 | #include "wl1271.h" | 31 | #include "wl1271.h" |
@@ -312,10 +312,12 @@ static irqreturn_t wl1271_irq(int irq, void *cookie) | |||
312 | return IRQ_HANDLED; | 312 | return IRQ_HANDLED; |
313 | } | 313 | } |
314 | 314 | ||
315 | static void wl1271_spi_set_power(struct wl1271 *wl, bool enable) | 315 | static int wl1271_spi_set_power(struct wl1271 *wl, bool enable) |
316 | { | 316 | { |
317 | if (wl->set_power) | 317 | if (wl->set_power) |
318 | wl->set_power(enable); | 318 | wl->set_power(enable); |
319 | |||
320 | return 0; | ||
319 | } | 321 | } |
320 | 322 | ||
321 | static struct wl1271_if_operations spi_ops = { | 323 | static struct wl1271_if_operations spi_ops = { |
@@ -370,6 +372,8 @@ static int __devinit wl1271_probe(struct spi_device *spi) | |||
370 | goto out_free; | 372 | goto out_free; |
371 | } | 373 | } |
372 | 374 | ||
375 | wl->ref_clock = pdata->board_ref_clock; | ||
376 | |||
373 | wl->irq = spi->irq; | 377 | wl->irq = spi->irq; |
374 | if (wl->irq < 0) { | 378 | if (wl->irq < 0) { |
375 | wl1271_error("irq missing in platform data"); | 379 | wl1271_error("irq missing in platform data"); |