diff options
author | Takashi Iwai <tiwai@suse.de> | 2013-05-29 06:37:32 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2013-05-29 06:37:32 -0400 |
commit | 20a24225d8f94fc56f74a9068684869d6deebea5 (patch) | |
tree | c7c78bc07df52098a3262942457a02a725cfd15b /sound/pci/vx222 | |
parent | 4059a42c51f45566a7eb69f0c7af3ff65bee7a52 (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/vx222')
-rw-r--r-- | sound/pci/vx222/vx222.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/pci/vx222/vx222.c b/sound/pci/vx222/vx222.c index e2f1ab37e154..ab8a9b1bfb8e 100644 --- a/sound/pci/vx222/vx222.c +++ b/sound/pci/vx222/vx222.c | |||
@@ -254,7 +254,6 @@ static int snd_vx222_probe(struct pci_dev *pci, | |||
254 | static void snd_vx222_remove(struct pci_dev *pci) | 254 | static void snd_vx222_remove(struct pci_dev *pci) |
255 | { | 255 | { |
256 | snd_card_free(pci_get_drvdata(pci)); | 256 | snd_card_free(pci_get_drvdata(pci)); |
257 | pci_set_drvdata(pci, NULL); | ||
258 | } | 257 | } |
259 | 258 | ||
260 | #ifdef CONFIG_PM_SLEEP | 259 | #ifdef CONFIG_PM_SLEEP |