diff options
| author | Takashi Iwai | 2012-08-20 22:14:26 +0200 |
|---|---|---|
| committer | Takashi Iwai | 2012-08-20 22:14:26 +0200 |
| commit | ddf83485d7da468251716b8040bac1280622181e (patch) | |
| tree | d28e9b511dedcfed447577f4bb49a99b244a9430 /sound/pci/sis7019.c | |
| parent | ALSA: hda - Add missing ifdef CONFIG_SND_HDA_POWER_SAVE to tracepoints (diff) | |
| parent | ALSA: hda - Fix leftover codec->power_transition (diff) | |
| download | kernel-qcow2-linux-ddf83485d7da468251716b8040bac1280622181e.tar.gz kernel-qcow2-linux-ddf83485d7da468251716b8040bac1280622181e.tar.xz kernel-qcow2-linux-ddf83485d7da468251716b8040bac1280622181e.zip | |
Merge branch 'for-linus' into for-next
Conflicts:
sound/pci/hda/hda_codec.c
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/sis7019.c')
| -rw-r--r-- | sound/pci/sis7019.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/pci/sis7019.c b/sound/pci/sis7019.c index 535efe295075..51e43407ebc5 100644 --- a/sound/pci/sis7019.c +++ b/sound/pci/sis7019.c @@ -1377,8 +1377,9 @@ static int __devinit sis_chip_create(struct snd_card *card, if (rc) goto error_out_cleanup; - if (request_irq(pci->irq, sis_interrupt, IRQF_SHARED, KBUILD_MODNAME, - sis)) { + rc = request_irq(pci->irq, sis_interrupt, IRQF_SHARED, KBUILD_MODNAME, + sis); + if (rc) { dev_err(&pci->dev, "unable to allocate irq %d\n", sis->irq); goto error_out_cleanup; } |