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 'akpm' (patches from Andrew)
[cascardo/linux.git]
/
drivers
/
media
/
platform
/
exynos4-is
/
media-dev.c
diff --git
a/drivers/media/platform/exynos4-is/media-dev.c
b/drivers/media/platform/exynos4-is/media-dev.c
index
891625e
..
1a1154a
100644
(file)
--- a/
drivers/media/platform/exynos4-is/media-dev.c
+++ b/
drivers/media/platform/exynos4-is/media-dev.c
@@
-1190,6
+1190,10
@@
static int fimc_md_link_notify(struct media_link *link, unsigned int flags,
return ret ? -EPIPE : 0;
}
return ret ? -EPIPE : 0;
}
+static const struct media_device_ops fimc_md_ops = {
+ .link_notify = fimc_md_link_notify,
+};
+
static ssize_t fimc_md_sysfs_show(struct device *dev,
struct device_attribute *attr, char *buf)
{
static ssize_t fimc_md_sysfs_show(struct device *dev,
struct device_attribute *attr, char *buf)
{
@@
-1416,7
+1420,7
@@
static int fimc_md_probe(struct platform_device *pdev)
strlcpy(fmd->media_dev.model, "SAMSUNG S5P FIMC",
sizeof(fmd->media_dev.model));
strlcpy(fmd->media_dev.model, "SAMSUNG S5P FIMC",
sizeof(fmd->media_dev.model));
- fmd->media_dev.
link_notify = fimc_md_link_notify
;
+ fmd->media_dev.
ops = &fimc_md_ops
;
fmd->media_dev.dev = dev;
v4l2_dev = &fmd->v4l2_dev;
fmd->media_dev.dev = dev;
v4l2_dev = &fmd->v4l2_dev;