Merge branch 'p-ti-linux-3.8.y' into p-ti-android-3.8.y

* p-ti-linux-3.8.y:
  ti-ec: Fix up for vip_open() crash when no camera connected.

Change-Id: I25a7a0aecf23e4ed6b3282450d87534c946a3e45
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>

1 files changed, 6 insertions, 0 deletions

diff --git a/drivers/misc/ti-ec/earlycam.c b/drivers/misc/ti-ec/earlycam.c
index 3cf82ef55c9e..f5f11520ac32 100644
--- a/drivers/misc/ti-ec/earlycam.c
+++ b/drivers/misc/ti-ec/earlycam.c
@@ -359,6 +359,12 @@ int main_fn(void *arg)
         dtr.d_inode = ∈
         fp.f_path.dentry = &dtr;
 
+        ret = video_devdata(&fp);
+        if (ret == NULL) {
+                pr_err("Camera device not connected\n");
+                return ret;
+        }
+
         ret = display_init();
         if (ret) {
                 pr_err("display_init failed with error %d", ret);