diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-01-29 19:03:20 (GMT) |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-01-29 19:03:20 (GMT) |
| commit | 56e1bd770614da94f35e88c150cf9edf8d0b57a2 (patch) | |
| tree | 5a18f6e797e7d60b634fe0d229ae624625af073e /drivers/net/wireless/ti/wlcore/spi.c | |
| parent | 9ebea3829fac7505e0cd2642fbd13cfa9c038831 (diff) | |
| parent | 5b37649bbcfc14c1ecfb76c5b018dd686924b946 (diff) | |
| download | linux-fsl-qoriq-56e1bd770614da94f35e88c150cf9edf8d0b57a2.tar.xz | |
Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx
Conflicts:
drivers/net/wireless/ti/wlcore/main.c
Diffstat (limited to 'drivers/net/wireless/ti/wlcore/spi.c')
| -rw-r--r-- | drivers/net/wireless/ti/wlcore/spi.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/ti/wlcore/spi.c b/drivers/net/wireless/ti/wlcore/spi.c index f06f477..2d700b7 100644 --- a/drivers/net/wireless/ti/wlcore/spi.c +++ b/drivers/net/wireless/ti/wlcore/spi.c @@ -270,7 +270,7 @@ static int __must_check wl12xx_spi_raw_write(struct device *child, int addr, void *buf, size_t len, bool fixed) { struct wl12xx_spi_glue *glue = dev_get_drvdata(child->parent); - struct spi_transfer t[2 * WSPI_MAX_NUM_OF_CHUNKS]; + struct spi_transfer t[2 * (WSPI_MAX_NUM_OF_CHUNKS + 1)]; struct spi_message m; u32 commands[WSPI_MAX_NUM_OF_CHUNKS]; u32 *cmd; @@ -407,8 +407,7 @@ static int wl1271_remove(struct spi_device *spi) { struct wl12xx_spi_glue *glue = spi_get_drvdata(spi); - platform_device_del(glue->core); - platform_device_put(glue->core); + platform_device_unregister(glue->core); kfree(glue); return 0; |