Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[pandora-kernel.git] / drivers / media / video / tlg2300 / pd-video.c

diff --git a/drivers/media/video/tlg2300/pd-video.c b/drivers/media/video/tlg2300/pd-video.c
index df33a1d..a794ae6 100644 (file)
--- 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 poseidon *pd, struct v4l2_pix_format *pix)
        }
        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;