From db70afe1dd18b5aa0bf4ece82158894a12e420bd Mon Sep 17 00:00:00 2001 From: Guennadi Liakhovetski Date: Mon, 4 Jul 2011 12:15:14 -0300 Subject: [PATCH] --- yaml --- r: 261601 b: refs/heads/master c: cb74cf5349a6a9225bbab278a808d5a0739c3b2c h: refs/heads/master i: 261599: edc0e6a07c5408ee317ab9da3d4667a6694078f3 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/sh_mobile_ceu_camera.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 49d6d1f23cbe..5f30dbffed44 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7dfff95366f48bf66f77c17cdc9ebd8be696ac5d +refs/heads/master: cb74cf5349a6a9225bbab278a808d5a0739c3b2c diff --git a/trunk/drivers/media/video/sh_mobile_ceu_camera.c b/trunk/drivers/media/video/sh_mobile_ceu_camera.c index f86550703f8e..e54089802b6b 100644 --- a/trunk/drivers/media/video/sh_mobile_ceu_camera.c +++ b/trunk/drivers/media/video/sh_mobile_ceu_camera.c @@ -422,8 +422,12 @@ static void sh_mobile_ceu_videobuf_release(struct vb2_buffer *vb) pcdev->active = NULL; } - /* Doesn't hurt also if the list is empty */ - list_del_init(&buf->queue); + /* + * Doesn't hurt also if the list is empty, but it hurts, if queuing the + * buffer failed, and .buf_init() hasn't been called + */ + if (buf->queue.next) + list_del_init(&buf->queue); spin_unlock_irq(&pcdev->lock); }