aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/video/cx88/cx88-alsa.c4
-rw-r--r--drivers/media/video/saa7134/saa7134-alsa.c4
2 files changed, 2 insertions, 6 deletions
diff --git a/drivers/media/video/cx88/cx88-alsa.c b/drivers/media/video/cx88/cx88-alsa.c
index 316b106c351..03feb5b49e1 100644
--- a/drivers/media/video/cx88/cx88-alsa.c
+++ b/drivers/media/video/cx88/cx88-alsa.c
@@ -690,10 +690,8 @@ MODULE_DEVICE_TABLE(pci, cx88_audio_pci_tbl);
690static int snd_cx88_free(snd_cx88_card_t *chip) 690static int snd_cx88_free(snd_cx88_card_t *chip)
691{ 691{
692 692
693 if (chip->irq >= 0){ 693 if (chip->irq >= 0)
694 synchronize_irq(chip->irq);
695 free_irq(chip->irq, chip); 694 free_irq(chip->irq, chip);
696 }
697 695
698 cx88_core_put(chip->core,chip->pci); 696 cx88_core_put(chip->core,chip->pci);
699 697
diff --git a/drivers/media/video/saa7134/saa7134-alsa.c b/drivers/media/video/saa7134/saa7134-alsa.c
index 047add8f301..ec6bdb9680a 100644
--- a/drivers/media/video/saa7134/saa7134-alsa.c
+++ b/drivers/media/video/saa7134/saa7134-alsa.c
@@ -954,10 +954,8 @@ static void snd_saa7134_free(struct snd_card * card)
954 if (chip->dev->dmasound.priv_data == NULL) 954 if (chip->dev->dmasound.priv_data == NULL)
955 return; 955 return;
956 956
957 if (chip->irq >= 0) { 957 if (chip->irq >= 0)
958 synchronize_irq(chip->irq);
959 free_irq(chip->irq, &chip->dev->dmasound); 958 free_irq(chip->irq, &chip->dev->dmasound);
960 }
961 959
962 chip->dev->dmasound.priv_data = NULL; 960 chip->dev->dmasound.priv_data = NULL;
963 961