diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-04-14 22:54:21 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-04-14 22:54:21 -0400 |
| commit | 3ec10cd8b526c6b10170c2649002672ee2019e73 (patch) | |
| tree | 27e3fb26020877ae43d3bcc5996c058957df3dc3 /drivers/media | |
| parent | 993916203f00e8c62599466a5caa866e09f0fae3 (diff) | |
| parent | 1be99f6c95e6c887756f789a60d15771235acd0c (diff) | |
Merge commit 'v2.6.38.3' into linaro-2.6.38
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/radio/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/media/video/tlg2300/pd-video.c | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/media/radio/Kconfig b/drivers/media/radio/Kconfig index ecdffa6aac6..c0902465bdf 100644 --- a/drivers/media/radio/Kconfig +++ b/drivers/media/radio/Kconfig @@ -441,6 +441,7 @@ config RADIO_TIMBERDALE config RADIO_WL1273 tristate "Texas Instruments WL1273 I2C FM Radio" depends on I2C && VIDEO_V4L2 + select MFD_CORE select MFD_WL1273_CORE select FW_LOADER ---help--- diff --git a/drivers/media/video/tlg2300/pd-video.c b/drivers/media/video/tlg2300/pd-video.c index df33a1d188b..a794ae62aeb 100644 --- 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; |