Merge tag 'upstream-3.11-rc1' of git://git.infradead.org/linux-ubifs

[~andy/linux] / sound / pci / bt87x.c

diff --git a/sound/pci/bt87x.c b/sound/pci/bt87x.c
index 9febe5509748ed5a1cdc2556d441ff770f31f8ea..18802039497afd3dfcafdd53dd1d0d62e503c4cc 100644 (file)
--- a/sound/pci/bt87x.c
+++ b/sound/pci/bt87x.c
@@ -953,7 +953,6 @@ _error:
 static void snd_bt87x_remove(struct pci_dev *pci)
 {
        snd_card_free(pci_get_drvdata(pci));
-       pci_set_drvdata(pci, NULL);
 }
 
 /* default entries for all Bt87x cards - it's not exported */