diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-07-01 10:27:25 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-07-01 10:27:25 +0200 |
| commit | bc32134c0523c60989d2f2439e176601668a62a5 (patch) | |
| tree | 03f63fc387e78592968a1f04ee4e173ca32fec20 /sound/pci/oxygen/oxygen_lib.c | |
| parent | 1c6770a38a6652777b9d1592b66e0d8e7dfb6160 (diff) | |
| parent | 066624c6a1733a72a67f1d06d35a2153e7d9082b (diff) | |
Merge branch 'for-next' into for-linus
Merge the whole changes for 3.11-rc1 merge
Diffstat (limited to 'sound/pci/oxygen/oxygen_lib.c')
| -rw-r--r-- | sound/pci/oxygen/oxygen_lib.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/pci/oxygen/oxygen_lib.c b/sound/pci/oxygen/oxygen_lib.c index 9562dc63ba6..b0cb48adddc 100644 --- a/sound/pci/oxygen/oxygen_lib.c +++ b/sound/pci/oxygen/oxygen_lib.c @@ -722,7 +722,6 @@ EXPORT_SYMBOL(oxygen_pci_probe); void oxygen_pci_remove(struct pci_dev *pci) { snd_card_free(pci_get_drvdata(pci)); - pci_set_drvdata(pci, NULL); } EXPORT_SYMBOL(oxygen_pci_remove); |