diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-12-02 15:46:37 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-12-02 15:46:37 -0500 |
| commit | 09f921f83faa49cdea25abfb98c439c01526b89d (patch) | |
| tree | 1e8ee5c8f14e0e57965eca81bc6725288fd3597b /drivers/net/wireless/libertas | |
| parent | 4cebb34caa5122216a1e2451eae9e0fc47ec2589 (diff) | |
| parent | d89197c7f34934fbb0f96d938a0d6cfe0b8bcb1c (diff) | |
| download | blackbird-op-linux-09f921f83faa49cdea25abfb98c439c01526b89d.tar.gz blackbird-op-linux-09f921f83faa49cdea25abfb98c439c01526b89d.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts:
drivers/net/wireless/ath/ath9k/ar9003_eeprom.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); |
