Merge branch 'p-ti-lsk-linux-4.4.y-next' into p-ti-lsk-android-linux-4.4.yp-ti-lsk-android-linux-4.4.y

* p-ti-lsk-linux-4.4.y-next:
  media: vip: Fail open if the subdev is not ready

Change-Id: I5f680705a4cf6ee4b13be06003a8e4db89ac9351
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>

1 files changed, 6 insertions, 2 deletions

diff --git a/drivers/media/platform/ti-vpe/vip.c b/drivers/media/platform/ti-vpe/vip.c
index 4fd828eaeee7..50d461f53f79 100644
--- a/drivers/media/platform/ti-vpe/vip.c
+++ b/drivers/media/platform/ti-vpe/vip.c
@@ -2700,9 +2700,11 @@ static int vip_init_port(struct vip_port *port)
         sd_fmt.which = V4L2_SUBDEV_FORMAT_ACTIVE;
         sd_fmt.pad = 0;
         ret = v4l2_subdev_call(port->subdev, pad, get_fmt, NULL, &sd_fmt);
-        if (ret)
+        if (ret) {
                 vip_dbg(1, dev, "init_port get_fmt failed in subdev: (%d)\n",
                         ret);
+                return ret;
+        }
 
         /* try to find one that matches */
         fmt = find_port_format_by_code(port, mbus_fmt->code);
@@ -3094,8 +3096,10 @@ static int vip_open(struct file *file)
         if (!v4l2_fh_is_singular_file(file))
                 goto unlock;
 
-        if (vip_init_stream(stream))
+        if (vip_init_stream(stream)) {
+                v4l2_fh_release(file);
                 ret = -ENODEV;
+        }
 unlock:
         mutex_unlock(&dev->mutex);
         return ret;