summaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2015-08-21 14:25:34 +0300
committerTakashi Iwai <tiwai@suse.de>2015-08-21 14:12:45 +0200
commit9e46aedab389122948144713ee5b8bae2658fb1b (patch)
treea6dd9088d72cd76b056d58be16233ffe227b4781 /sound/pci
parent18dfd79d92e5292611ac4944a67bd837dd7632c9 (diff)
downloadop-kernel-dev-9e46aedab389122948144713ee5b8bae2658fb1b.zip
op-kernel-dev-9e46aedab389122948144713ee5b8bae2658fb1b.tar.gz
ALSA: hdsp: silence and underflow warning
I believe this probably cannot happen, as the code suggests. There would have to be an kcontrol->index.id which was zero, otherwise this would be prevented in snd_ctl_find_id(). But snd_BUG_ON() is just a WARN() or a no-op so static checkers complain that we keep on going with a negative offset. Let's just handle the error as well as printing a warning. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/rme9652/hdsp.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/pci/rme9652/hdsp.c b/sound/pci/rme9652/hdsp.c
index c19e021..468a95c 100644
--- a/sound/pci/rme9652/hdsp.c
+++ b/sound/pci/rme9652/hdsp.c
@@ -2806,7 +2806,8 @@ static int snd_hdsp_get_adat_sync_check(struct snd_kcontrol *kcontrol, struct sn
struct hdsp *hdsp = snd_kcontrol_chip(kcontrol);
offset = ucontrol->id.index - 1;
- snd_BUG_ON(offset < 0);
+ if (snd_BUG_ON(offset < 0))
+ return -EINVAL;
switch (hdsp->io_type) {
case Digiface:
OpenPOWER on IntegriCloud