aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/cs4281.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-05-29 06:37:32 -0400
committerTakashi Iwai <tiwai@suse.de>2013-05-29 06:37:32 -0400
commit20a24225d8f94fc56f74a9068684869d6deebea5 (patch)
treec7c78bc07df52098a3262942457a02a725cfd15b /sound/pci/cs4281.c
parent4059a42c51f45566a7eb69f0c7af3ff65bee7a52 (diff)
ALSA: PCI: Remove superfluous pci_set_drvdata(pci, NULL) at remove
As drvdata is cleared to NULL at probe failure or at removal by the driver core, we don't have to call pci_set_drvdata(pci, NULL) any longer in each driver. The only remaining pci_set_drvdata(NULL) is in azx_firmware_cb() in hda_intel.c. Since this function itself releases the card instance, we need to clear drvdata here as well, so that it won't be released doubly in the remove callback. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/cs4281.c')
-rw-r--r--sound/pci/cs4281.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/pci/cs4281.c b/sound/pci/cs4281.c
index 6a8695069941..64659facd155 100644
--- a/sound/pci/cs4281.c
+++ b/sound/pci/cs4281.c
@@ -1971,7 +1971,6 @@ static int snd_cs4281_probe(struct pci_dev *pci,
1971static void snd_cs4281_remove(struct pci_dev *pci) 1971static void snd_cs4281_remove(struct pci_dev *pci)
1972{ 1972{
1973 snd_card_free(pci_get_drvdata(pci)); 1973 snd_card_free(pci_get_drvdata(pci));
1974 pci_set_drvdata(pci, NULL);
1975} 1974}
1976 1975
1977/* 1976/*