summaryrefslogtreecommitdiffstats
path: root/include/video
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2015-02-25 09:23:58 +0100
committerTomi Valkeinen <tomi.valkeinen@ti.com>2015-02-26 09:23:15 +0100
commita38bb793eaebe1178fbd8ef6ab66ccc062bad505 (patch)
treea9c7f9874bb482de030ddf2daf830eb72f445fed /include/video
parentvideo: fbdev: fix possible null dereference (diff)
downloadlinux-a38bb793eaebe1178fbd8ef6ab66ccc062bad505.tar.xz
linux-a38bb793eaebe1178fbd8ef6ab66ccc062bad505.zip
OMAPDSS: fix regression with display sysfs files
omapdss's sysfs directories for displays used to have 'name' file, giving the name for the display. This file was later renamed to 'display_name' to avoid conflicts with i2c sysfs 'name' file. Looks like at least xserver-xorg-video-omap3 requires the 'name' file to be present. To fix the regression, this patch creates new kobjects for each display, allowing us to create sysfs directories for the displays. This way we have the whole directory for omapdss, and there will be no sysfs file clashes with the underlying display device's sysfs files. We can thus add the 'name' sysfs file back. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> Tested-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'include/video')
-rw-r--r--include/video/omapdss.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/video/omapdss.h b/include/video/omapdss.h
index 60de61fea8e3..c8ed15daad02 100644
--- a/include/video/omapdss.h
+++ b/include/video/omapdss.h
@@ -689,6 +689,7 @@ struct omapdss_dsi_ops {
};
struct omap_dss_device {
+ struct kobject kobj;
struct device *dev;
struct module *owner;