diff options
author | Vishal Mahaveer | 2014-08-25 18:19:57 -0500 |
---|---|---|
committer | Vishal Mahaveer | 2014-08-25 18:19:57 -0500 |
commit | 7ec838551e24dbbad5fbb65f9d653ab0607b879e (patch) | |
tree | 9e2c63954350880e97bdb54b6a6c31b8c4f0d4ed | |
parent | 574065eb530c15b4e06d3f439cbac230ec3da700 (diff) | |
parent | 475700abacd2419a9783183ff2f23c8b6c911614 (diff) | |
download | kernel-audio-7ec838551e24dbbad5fbb65f9d653ab0607b879e.tar.gz kernel-audio-7ec838551e24dbbad5fbb65f9d653ab0607b879e.tar.xz kernel-audio-7ec838551e24dbbad5fbb65f9d653ab0607b879e.zip |
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>
-rw-r--r-- | drivers/misc/ti-ec/earlycam.c | 6 |
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) | |||
359 | dtr.d_inode = ∈ | 359 | dtr.d_inode = ∈ |
360 | fp.f_path.dentry = &dtr; | 360 | fp.f_path.dentry = &dtr; |
361 | 361 | ||
362 | ret = video_devdata(&fp); | ||
363 | if (ret == NULL) { | ||
364 | pr_err("Camera device not connected\n"); | ||
365 | return ret; | ||
366 | } | ||
367 | |||
362 | ret = display_init(); | 368 | ret = display_init(); |
363 | if (ret) { | 369 | if (ret) { |
364 | pr_err("display_init failed with error %d", ret); | 370 | pr_err("display_init failed with error %d", ret); |