summaryrefslogtreecommitdiffstats
path: root/sound/pci/asihpi/hpioctl.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-05-29 12:37:32 +0200
committerTakashi Iwai <tiwai@suse.de>2013-05-29 12:37:32 +0200
commit20a24225d8f94fc56f74a9068684869d6deebea5 (patch)
treec7c78bc07df52098a3262942457a02a725cfd15b /sound/pci/asihpi/hpioctl.c
parent4059a42c51f45566a7eb69f0c7af3ff65bee7a52 (diff)
downloadblackbird-op-linux-20a24225d8f94fc56f74a9068684869d6deebea5.tar.gz
blackbird-op-linux-20a24225d8f94fc56f74a9068684869d6deebea5.zip
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/asihpi/hpioctl.c')
-rw-r--r--sound/pci/asihpi/hpioctl.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/pci/asihpi/hpioctl.c b/sound/pci/asihpi/hpioctl.c
index ef5019fe5193..7f0272032fbb 100644
--- a/sound/pci/asihpi/hpioctl.c
+++ b/sound/pci/asihpi/hpioctl.c
@@ -445,7 +445,6 @@ void asihpi_adapter_remove(struct pci_dev *pci_dev)
if (pa->p_buffer)
vfree(pa->p_buffer);
- pci_set_drvdata(pci_dev, NULL);
if (1)
dev_info(&pci_dev->dev,
"remove %04x:%04x,%04x:%04x,%04x, HPI index %d\n",
OpenPOWER on IntegriCloud