diff options
| author | David S. Miller <davem@davemloft.net> | 2010-12-08 22:15:38 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-12-08 22:47:38 +0100 |
| commit | fe6c791570efe717946ea7b7dd50aec96b70d551 (patch) | |
| tree | 1becb5e8aea7a9c9a7d78f987bd73b0a5d8ee434 /drivers/net/wireless/libertas | |
| parent | isdn/hisax: fix compiler warning on hisax_pci_tbl (diff) | |
| parent | tcp: protect sysctl_tcp_cookie_size reads (diff) | |
| download | linux-fe6c791570efe717946ea7b7dd50aec96b70d551.tar.xz linux-fe6c791570efe717946ea7b7dd50aec96b70d551.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
net/llc/af_llc.c
Diffstat (limited to 'drivers/net/wireless/libertas')
| -rw-r--r-- | drivers/net/wireless/libertas/if_sdio.c | 1 | ||||
| -rw-r--r-- | drivers/net/wireless/libertas/if_spi.c | 1 | ||||
| -rw-r--r-- | drivers/net/wireless/libertas/main.c | 2 |
3 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/wireless/libertas/if_sdio.c b/drivers/net/wireless/libertas/if_sdio.c index e5685dc317a8..b4de0ca10feb 100644 --- a/drivers/net/wireless/libertas/if_sdio.c +++ b/drivers/net/wireless/libertas/if_sdio.c @@ -1170,7 +1170,6 @@ static void if_sdio_remove(struct sdio_func *func) lbs_deb_sdio("call remove card\n"); lbs_stop_card(card->priv); lbs_remove_card(card->priv); - card->priv->surpriseremoved = 1; flush_workqueue(card->workqueue); destroy_workqueue(card->workqueue); diff --git a/drivers/net/wireless/libertas/if_spi.c b/drivers/net/wireless/libertas/if_spi.c index 79bcb4e5d2ca..ecd4d04b2c3c 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) diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c index 143473c59393..6836a6dd9853 100644 --- a/drivers/net/wireless/libertas/main.c +++ b/drivers/net/wireless/libertas/main.c @@ -916,8 +916,6 @@ void lbs_remove_card(struct lbs_private *priv) lbs_free_adapter(priv); lbs_cfg_free(priv); - - priv->dev = NULL; free_netdev(dev); lbs_deb_leave(LBS_DEB_MAIN); |