projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'i2c/for-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
[cascardo/linux.git]
/
drivers
/
media
/
i2c
/
ov9650.c
diff --git
a/drivers/media/i2c/ov9650.c
b/drivers/media/i2c/ov9650.c
index
1ee6a55
..
a0b3c9b
100644
(file)
--- a/
drivers/media/i2c/ov9650.c
+++ b/
drivers/media/i2c/ov9650.c
@@
-29,7
+29,7
@@
#include <media/v4l2-image-sizes.h>
#include <media/v4l2-subdev.h>
#include <media/v4l2-mediabus.h>
#include <media/v4l2-image-sizes.h>
#include <media/v4l2-subdev.h>
#include <media/v4l2-mediabus.h>
-#include <media/ov9650.h>
+#include <media/
i2c/
ov9650.h>
static int debug;
module_param(debug, int, 0644);
static int debug;
module_param(debug, int, 0644);
@@
-1500,8
+1500,8
@@
static int ov965x_probe(struct i2c_client *client,
return ret;
ov965x->pad.flags = MEDIA_PAD_FL_SOURCE;
return ret;
ov965x->pad.flags = MEDIA_PAD_FL_SOURCE;
- sd->entity.
type = MEDIA_ENT_T_V4L2_SUBDEV
_SENSOR;
- ret = media_entity_
init(&sd->entity, 1, &ov965x->pad, 0
);
+ sd->entity.
function = MEDIA_ENT_F_CAM
_SENSOR;
+ ret = media_entity_
pads_init(&sd->entity, 1, &ov965x->pad
);
if (ret < 0)
return ret;
if (ret < 0)
return ret;