aboutsummaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorWerner Almesberger <werner@openmoko.org>2009-03-05 14:40:27 +0000
committerAndy Green <agreen@octopus.localdomain>2009-03-05 14:40:27 +0000
commitfcc8cec4e6a2bd534210ba4299e7daf530568d08 (patch)
tree142ae6263821a12a36317e0a375519a99999f4e2 /drivers/media
parent1c07916501614ce24b3530f9c2651001fc41eb49 (diff)
Dirty hacks to make it all work
A few dirty hacks to make the camera driver work: - because V4L no longer guarantees that minor numbers provided by the client are actually used, the preview/codec selection mechanism falls apart. We work around this by defaulting to preview when we don't know better. - power up the camera in platform code, not cleanly via power control device. Signed-off-by: Werner Almesberger <werner@openmoko.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/s3c_camera_driver.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/video/s3c_camera_driver.c b/drivers/media/video/s3c_camera_driver.c
index 599f9b810bb..ee2763696e6 100644
--- a/drivers/media/video/s3c_camera_driver.c
+++ b/drivers/media/video/s3c_camera_driver.c
@@ -74,6 +74,7 @@ camif_cfg_t *s3c_camif_get_fimc_object(int nr)
default:
printk(KERN_ERR "Unknown minor number\n");
+ ret = &s3c_fimc[FIMC_PREVIEW_INDEX];
}
return ret;