projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'media/v4.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
[linux-2.6-block.git]
/
drivers
/
staging
/
media
/
imx
/
imx-media-dev.c
diff --git
a/drivers/staging/media/imx/imx-media-dev.c
b/drivers/staging/media/imx/imx-media-dev.c
index 026b9cbe581d49e7bcef260ae875eb63f5eb2915..4b344a4a3706d927465543836025824e739a3cc2 100644
(file)
--- a/
drivers/staging/media/imx/imx-media-dev.c
+++ b/
drivers/staging/media/imx/imx-media-dev.c
@@
-350,7
+350,7
@@
static int imx_media_inherit_controls(struct imx_media_dev *imxmd,
ret = v4l2_ctrl_add_handler(vfd->ctrl_handler,
sd->ctrl_handler,
- NULL);
+ NULL
, true
);
if (ret)
return ret;
}