diff options
Diffstat (limited to 'include/media/soc_camera.h')
-rw-r--r-- | include/media/soc_camera.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/include/media/soc_camera.h b/include/media/soc_camera.h index 9d69f01b6fa2..c9a5bbfa6ab5 100644 --- a/include/media/soc_camera.h +++ b/include/media/soc_camera.h | |||
@@ -266,8 +266,8 @@ static inline unsigned long soc_camera_bus_param_compatible( | |||
266 | common_flags; | 266 | common_flags; |
267 | } | 267 | } |
268 | 268 | ||
269 | static inline void soc_camera_limit_side(unsigned int *start, | 269 | static inline void soc_camera_limit_side(int *start, int *length, |
270 | unsigned int *length, unsigned int start_min, | 270 | unsigned int start_min, |
271 | unsigned int length_min, unsigned int length_max) | 271 | unsigned int length_min, unsigned int length_max) |
272 | { | 272 | { |
273 | if (*length < length_min) | 273 | if (*length < length_min) |
@@ -284,4 +284,12 @@ static inline void soc_camera_limit_side(unsigned int *start, | |||
284 | extern unsigned long soc_camera_apply_sensor_flags(struct soc_camera_link *icl, | 284 | extern unsigned long soc_camera_apply_sensor_flags(struct soc_camera_link *icl, |
285 | unsigned long flags); | 285 | unsigned long flags); |
286 | 286 | ||
287 | /* This is only temporary here - until v4l2-subdev begins to link to video_device */ | ||
288 | #include <linux/i2c.h> | ||
289 | static inline struct video_device *soc_camera_i2c_to_vdev(struct i2c_client *client) | ||
290 | { | ||
291 | struct soc_camera_device *icd = client->dev.platform_data; | ||
292 | return icd->vdev; | ||
293 | } | ||
294 | |||
287 | #endif | 295 | #endif |