diff options
author | David S. Miller <davem@davemloft.net> | 2010-12-08 08:13:01 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-12-08 08:13:01 -0800 |
commit | 4f58605e6b7ae30a0d048af6a868582768e6754c (patch) | |
tree | 2b72e81761c7874b48825267958e58823e05b592 /drivers/net/wireless/libertas/if_spi.c | |
parent | b8eb3a1046f68a5b8f284830d971c62688cd606b (diff) | |
parent | d89197c7f34934fbb0f96d938a0d6cfe0b8bcb1c (diff) | |
download | kernel_samsung_tuna-4f58605e6b7ae30a0d048af6a868582768e6754c.zip kernel_samsung_tuna-4f58605e6b7ae30a0d048af6a868582768e6754c.tar.gz kernel_samsung_tuna-4f58605e6b7ae30a0d048af6a868582768e6754c.tar.bz2 |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/libertas/if_spi.c')
-rw-r--r-- | drivers/net/wireless/libertas/if_spi.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/libertas/if_spi.c b/drivers/net/wireless/libertas/if_spi.c index 79bcb4e..ecd4d04 100644 --- a/drivers/net/wireless/libertas/if_spi.c +++ b/drivers/net/wireless/libertas/if_spi.c @@ -1055,7 +1055,6 @@ static int __devexit libertas_spi_remove(struct spi_device *spi) lbs_stop_card(priv); lbs_remove_card(priv); /* will call free_netdev */ - priv->surpriseremoved = 1; free_irq(spi->irq, card); if_spi_terminate_spi_thread(card); if (card->pdata->teardown) |