[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20061106183018.GB8099@stusta.de>
Date: Mon, 6 Nov 2006 19:30:18 +0100
From: Adrian Bunk <bunk@...sta.de>
To: perex@...e.cz, alsa-devel@...a-project.org
Cc: linux-kernel@...r.kernel.org
Subject: [2.6 patch] sound/core/control.c: remove dead code
This patch removes some obviously dead code spotted by the Coverity
checker.
Signed-off-by: Adrian Bunk <bunk@...sta.de>
--- linux-2.6/sound/core/control.c.old 2006-11-06 19:11:32.000000000 +0100
+++ linux-2.6/sound/core/control.c 2006-11-06 19:11:52.000000000 +0100
@@ -1267,23 +1267,23 @@ static ssize_t snd_ctl_read(struct file
if ((file->f_flags & O_NONBLOCK) != 0 || result > 0) {
err = -EAGAIN;
goto __end_lock;
}
init_waitqueue_entry(&wait, current);
add_wait_queue(&ctl->change_sleep, &wait);
set_current_state(TASK_INTERRUPTIBLE);
spin_unlock_irq(&ctl->read_lock);
schedule();
remove_wait_queue(&ctl->change_sleep, &wait);
if (signal_pending(current))
- return result > 0 ? result : -ERESTARTSYS;
+ return -ERESTARTSYS;
spin_lock_irq(&ctl->read_lock);
}
kev = snd_kctl_event(ctl->events.next);
ev.type = SNDRV_CTL_EVENT_ELEM;
ev.data.elem.mask = kev->mask;
ev.data.elem.id = kev->id;
list_del(&kev->list);
spin_unlock_irq(&ctl->read_lock);
kfree(kev);
if (copy_to_user(buffer, &ev, sizeof(struct snd_ctl_event))) {
err = -EFAULT;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists