diff options
| author | Pawit Pornkitprasan <p.pawit@gmail.com> | 2013-03-21 14:02:44 +0700 |
|---|---|---|
| committer | Pawit Pornkitprasan <p.pawit@gmail.com> | 2013-03-21 14:03:15 +0700 |
| commit | 99fed99a60000dcf75842a88103bfb513511cdd8 (patch) | |
| tree | 3daa2950331a080c0292916a63e6b6e0056a365e /sound | |
| parent | cdf733ed16cf85e9d89ed45f0eceb060f77955fd (diff) | |
| parent | ef4fb40e21750ad9c3d1b017c61a9a69701039ff (diff) | |
| download | kernel_samsung_aries-99fed99a60000dcf75842a88103bfb513511cdd8.zip kernel_samsung_aries-99fed99a60000dcf75842a88103bfb513511cdd8.tar.gz kernel_samsung_aries-99fed99a60000dcf75842a88103bfb513511cdd8.tar.bz2 | |
Merge 3.0.70
Change-Id: I4316261b071ad622fcf62dcae7874c2ea6d9604d
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/core/seq/seq_timer.c | 8 | ||||
| -rw-r--r-- | sound/core/vmaster.c | 5 | ||||
| -rw-r--r-- | sound/pci/ice1712/ice1712.c | 2 |
3 files changed, 10 insertions, 5 deletions
diff --git a/sound/core/seq/seq_timer.c b/sound/core/seq/seq_timer.c index 160b1bd..24d44b2 100644 --- a/sound/core/seq/seq_timer.c +++ b/sound/core/seq/seq_timer.c @@ -290,10 +290,10 @@ int snd_seq_timer_open(struct snd_seq_queue *q) tid.device = SNDRV_TIMER_GLOBAL_SYSTEM; err = snd_timer_open(&t, str, &tid, q->queue); } - if (err < 0) { - snd_printk(KERN_ERR "seq fatal error: cannot create timer (%i)\n", err); - return err; - } + } + if (err < 0) { + snd_printk(KERN_ERR "seq fatal error: cannot create timer (%i)\n", err); + return err; } t->callback = snd_seq_timer_interrupt; t->callback_data = q; diff --git a/sound/core/vmaster.c b/sound/core/vmaster.c index a39d3d8..6058a37 100644 --- a/sound/core/vmaster.c +++ b/sound/core/vmaster.c @@ -207,7 +207,10 @@ static int slave_put(struct snd_kcontrol *kcontrol, } if (!changed) return 0; - return slave_put_val(slave, ucontrol); + err = slave_put_val(slave, ucontrol); + if (err < 0) + return err; + return 1; } static int slave_tlv_cmd(struct snd_kcontrol *kcontrol, diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c index f4594d7..3ec8fed 100644 --- a/sound/pci/ice1712/ice1712.c +++ b/sound/pci/ice1712/ice1712.c @@ -2595,6 +2595,8 @@ static int __devinit snd_ice1712_create(struct snd_card *card, snd_ice1712_proc_init(ice); synchronize_irq(pci->irq); + card->private_data = ice; + err = pci_request_regions(pci, "ICE1712"); if (err < 0) { kfree(ice); |