diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-08-21 00:14:26 +0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-08-21 00:14:26 +0400 |
commit | ddf83485d7da468251716b8040bac1280622181e (patch) | |
tree | d28e9b511dedcfed447577f4bb49a99b244a9430 /sound/pci/sis7019.c | |
parent | 099d53c308f50e8ee5b6638ec3f40f0104b3ee31 (diff) | |
parent | 535b6c51fe8293c88ce919cdfc4390c67a1cb6d1 (diff) | |
download | linux-ddf83485d7da468251716b8040bac1280622181e.tar.xz |
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; } |