2.6.38-stable review patch.  If anyone has any objections, please let us know.

------------------

From: Alexander Strakh <[email protected]>

commit a07500ef690fcbec76e879ee2093d7ca69883825 upstream.

Error path in file drivers/media/video/tlg2300/pd-video.c:
1. First mutex_unlock on &pd->lock in line 767 (in function that
   called from line 805)
2. Second in line  806

 805        pd_vidioc_s_fmt(pd, &f->fmt.pix);
 806        mutex_unlock(&pd->lock);

Found by Linux Device Drivers Verification Project

Signed-off-by: Alexander Strakh <[email protected]>
Acked-by: Huang Shijie <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

---
 drivers/media/video/tlg2300/pd-video.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--- a/drivers/media/video/tlg2300/pd-video.c
+++ b/drivers/media/video/tlg2300/pd-video.c
@@ -764,10 +764,8 @@ static int pd_vidioc_s_fmt(struct poseid
        }
        ret |= send_set_req(pd, VIDEO_ROSOLU_SEL,
                                vid_resol, &cmd_status);
-       if (ret || cmd_status) {
-               mutex_unlock(&pd->lock);
+       if (ret || cmd_status)
                return -EBUSY;
-       }
 
        pix_def->pixelformat = pix->pixelformat; /* save it */
        pix->height = (context->tvnormid & V4L2_STD_525_60) ?  480 : 576;


_______________________________________________
stable mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/stable

Reply via email to