diff options
| author | Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> | 2019-06-12 19:45:42 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | 2019-06-21 16:40:44 -0400 |
| commit | 11492ee7cbfec989caf319bc299f0004b8a23e01 (patch) | |
| tree | 53d64f3e5f3b8fe6d5e58cacef14dacc88e7f689 /drivers/media/platform/rcar-vin/rcar-v4l2.c | |
| parent | b2ef816c3db01f365448e8623c4f1d51cc2ba610 (diff) | |
| download | linux-stable-11492ee7cbfec989caf319bc299f0004b8a23e01.tar.gz linux-stable-11492ee7cbfec989caf319bc299f0004b8a23e01.tar.bz2 linux-stable-11492ee7cbfec989caf319bc299f0004b8a23e01.zip | |
media: rcar-vin: Allow interrupting lock when trying to open the video device
The user should be allowed to break waiting for the lock when opening
the video device.
Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Reviewed-by: Ulrich Hecht <uli+renesas@fpond.eu>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'drivers/media/platform/rcar-vin/rcar-v4l2.c')
| -rw-r--r-- | drivers/media/platform/rcar-vin/rcar-v4l2.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/platform/rcar-vin/rcar-v4l2.c b/drivers/media/platform/rcar-vin/rcar-v4l2.c index 0841f1a0bfd7..f67cef97b89a 100644 --- a/drivers/media/platform/rcar-vin/rcar-v4l2.c +++ b/drivers/media/platform/rcar-vin/rcar-v4l2.c @@ -821,7 +821,9 @@ static int rvin_open(struct file *file) struct rvin_dev *vin = video_drvdata(file); int ret; - mutex_lock(&vin->lock); + ret = mutex_lock_interruptible(&vin->lock); + if (ret) + return ret; file->private_data = vin; |