Commit 3cdadc50 authored by Richard Zidlicky's avatar Richard Zidlicky Committed by Mauro Carvalho Chehab

V4L/DVB: dvb: fix smscore_getbuffer() logic

Drivers shouldn't sleep while holding a spinlock. A previous workaround
were to release the spinlock before callinc schedule().

This patch uses a different approach: it just waits for the
siano hardware to answer.
Signed-off-by: default avatarRichard Zidlicky <rz@linux-m68k.org>
Cc: stable@kernel.org
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 970d14c6
...@@ -1098,33 +1098,26 @@ EXPORT_SYMBOL_GPL(smscore_onresponse); ...@@ -1098,33 +1098,26 @@ EXPORT_SYMBOL_GPL(smscore_onresponse);
* *
* @return pointer to descriptor on success, NULL on error. * @return pointer to descriptor on success, NULL on error.
*/ */
struct smscore_buffer_t *smscore_getbuffer(struct smscore_device_t *coredev)
struct smscore_buffer_t *get_entry(struct smscore_device_t *coredev)
{ {
struct smscore_buffer_t *cb = NULL; struct smscore_buffer_t *cb = NULL;
unsigned long flags; unsigned long flags;
DEFINE_WAIT(wait);
spin_lock_irqsave(&coredev->bufferslock, flags); spin_lock_irqsave(&coredev->bufferslock, flags);
if (!list_empty(&coredev->buffers)) {
/* This function must return a valid buffer, since the buffer list is cb = (struct smscore_buffer_t *) coredev->buffers.next;
* finite, we check that there is an available buffer, if not, we wait list_del(&cb->entry);
* until such buffer become available.
*/
prepare_to_wait(&coredev->buffer_mng_waitq, &wait, TASK_INTERRUPTIBLE);
if (list_empty(&coredev->buffers)) {
spin_unlock_irqrestore(&coredev->bufferslock, flags);
schedule();
spin_lock_irqsave(&coredev->bufferslock, flags);
} }
spin_unlock_irqrestore(&coredev->bufferslock, flags);
return cb;
}
finish_wait(&coredev->buffer_mng_waitq, &wait); struct smscore_buffer_t *smscore_getbuffer(struct smscore_device_t *coredev)
{
cb = (struct smscore_buffer_t *) coredev->buffers.next; struct smscore_buffer_t *cb = NULL;
list_del(&cb->entry);
spin_unlock_irqrestore(&coredev->bufferslock, flags); wait_event(coredev->buffer_mng_waitq, (cb = get_entry(coredev)));
return cb; return cb;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment