media: rcar-vin: Allow interrupting lock when trying to open the video device

[linux-2.6-microblaze.git] / drivers / media / platform / rcar-vin / rcar-v4l2.c

diff --git a/drivers/media/platform/rcar-vin/rcar-v4l2.c b/drivers/media/platform/rcar-vin/rcar-v4l2.c
index 0841f1a..f67cef9 100644 (file)
--- 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;