diff options
| author | Todd Poynor <toddpoynor@google.com> | 2013-04-05 13:56:44 -0700 |
|---|---|---|
| committer | Todd Poynor <toddpoynor@google.com> | 2013-04-05 13:56:44 -0700 |
| commit | 12b868488bc5abfb5fc0910aa34b32d6209073df (patch) | |
| tree | 5d37b78d71a0070a73fa8bcead7dce040119f554 /sound/core | |
| parent | 0bb6ee4f4587d219cfbb328e8a14f608405b52b9 (diff) | |
| parent | ae7859181482fcfe38d9352bd0932fa45456bdd0 (diff) | |
| download | kernel_samsung_tuna-12b868488bc5abfb5fc0910aa34b32d6209073df.zip kernel_samsung_tuna-12b868488bc5abfb5fc0910aa34b32d6209073df.tar.gz kernel_samsung_tuna-12b868488bc5abfb5fc0910aa34b32d6209073df.tar.bz2 | |
Merge tag 'v3.0.72' into android-3.0
This is the 3.0.72 stable release
Diffstat (limited to 'sound/core')
| -rw-r--r-- | sound/core/seq/seq_timer.c | 8 | ||||
| -rw-r--r-- | sound/core/vmaster.c | 5 |
2 files changed, 8 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, |