projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[media] uapi/media.h: Rename entities types to functions
[cascardo/linux.git]
/
drivers
/
media
/
i2c
/
lm3646.c
diff --git
a/drivers/media/i2c/lm3646.c
b/drivers/media/i2c/lm3646.c
index
626fb46
..
ba5ee0d
100644
(file)
--- a/
drivers/media/i2c/lm3646.c
+++ b/
drivers/media/i2c/lm3646.c
@@
-18,7
+18,7
@@
#include <linux/slab.h>
#include <linux/regmap.h>
#include <linux/videodev2.h>
#include <linux/slab.h>
#include <linux/regmap.h>
#include <linux/videodev2.h>
-#include <media/lm3646.h>
+#include <media/
i2c/
lm3646.h>
#include <media/v4l2-ctrls.h>
#include <media/v4l2-device.h>
#include <media/v4l2-ctrls.h>
#include <media/v4l2-device.h>
@@
-282,10
+282,10
@@
static int lm3646_subdev_init(struct lm3646_flash *flash)
rval = lm3646_init_controls(flash);
if (rval)
goto err_out;
rval = lm3646_init_controls(flash);
if (rval)
goto err_out;
- rval = media_entity_init(&flash->subdev_led.entity, 0, NULL
, 0
);
+ rval = media_entity_init(&flash->subdev_led.entity, 0, NULL);
if (rval < 0)
goto err_out;
if (rval < 0)
goto err_out;
- flash->subdev_led.entity.
type = MEDIA_ENT_T_V4L2_SUBDEV
_FLASH;
+ flash->subdev_led.entity.
function = MEDIA_ENT_F
_FLASH;
return rval;
err_out:
return rval;
err_out: