diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-10 01:35:29 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-10 01:35:29 +0100 |
| commit | ecddad64d4ca427c71598cc23183f48bc9cc4568 (patch) | |
| tree | 935374c13d013683e8a3bdd2136f6b8adfcf1ff1 /include | |
| parent | Merge branch 'for-4.0-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| parent | OMAPDSS: fix regression with display sysfs files (diff) | |
| download | linux-ecddad64d4ca427c71598cc23183f48bc9cc4568.tar.xz linux-ecddad64d4ca427c71598cc23183f48bc9cc4568.zip | |
Merge tag 'fbdev-fixes-4.0' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux
Pull fbdev fixes from Tomi Valkeinen:
- Fix regression in with omapdss when using i2c displays
- Fix possible null deref in fbmon
- Check kalloc return value in AMBA CLCD
* tag 'fbdev-fixes-4.0' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux:
OMAPDSS: fix regression with display sysfs files
video: fbdev: fix possible null dereference
video: ARM CLCD: Add missing error check for devm_kzalloc
Diffstat (limited to 'include')
| -rw-r--r-- | include/video/omapdss.h | 1 |
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; |