diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-06-05 17:21:29 +0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-06-05 17:21:29 +0400 |
| commit | c9e34d1525ffd554f29dc01674eac279de2e759d (patch) | |
| tree | 577ff9e4a92e5ebaca1196d7e60b0963eac427fc /sound/pci/sis7019.c | |
| parent | 02b504d9d8e565081b99176e7e464821d76fc994 (diff) | |
| parent | 11e7064f35bb87da8f427d1aa4bbd8b7473a3993 (diff) | |
| download | linux-c9e34d1525ffd554f29dc01674eac279de2e759d.tar.xz | |
Merge branch 'for-linus' into for-next
* for-linus: (778 commits)
ALSA: usb-audio - Fix invalid volume resolution on Logitech HD webcam c270
ALSA: usb-audio - Apply Logitech QuickCam Pro 9000 quirk only to audio iface
ALSA: hda/via - Clean up duplicated codes
ALSA: hda/via - Fix wrongly cleared pins after suspend on VT1802
ALSA: hda - Add keep_eapd_on flag to generic parser
ALSA: hda - Allow setting automute/automic hooks after parsing
ALSA: hda/via - Disable broken dynamic power control
ALSA: usb-audio: fix Roland/Cakewalk UM-3G support
ALSA: hda - Add headset quirk for two Dell machines
ALSA: hda - add dock support for Thinkpad T431s
ALSA: sis7019: fix error return code in sis_chip_create()
ASoC: cs42l52: fix default value for MASTERA_VOL.
ASoC: wm8994: check for array index returned
ASoC: wm8994: Fix reporting of accessory removal on WM8958
ASoC: wm8994: use the correct pointer to get the control value
Linux 3.10-rc3
ipc/sem.c: Fix missing wakeups in do_smart_update_queue()
score: remove redundant kcore_list entries
ASoC: wm5110: Correct DSP4R Mixer control name
ARC: lazy dcache flush broke gdb in non-aliasing configs
...
Diffstat (limited to 'sound/pci/sis7019.c')
| -rw-r--r-- | sound/pci/sis7019.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/pci/sis7019.c b/sound/pci/sis7019.c index f2639a0c5a65..e413b4e2c819 100644 --- a/sound/pci/sis7019.c +++ b/sound/pci/sis7019.c @@ -1341,7 +1341,8 @@ static int sis_chip_create(struct snd_card *card, if (rc) goto error_out; - if (pci_set_dma_mask(pci, DMA_BIT_MASK(30)) < 0) { + rc = pci_set_dma_mask(pci, DMA_BIT_MASK(30)); + if (rc < 0) { dev_err(&pci->dev, "architecture does not support 30-bit PCI busmaster DMA"); goto error_out_enabled; } |