diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-12 09:11:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-12 09:11:37 -0700 |
| commit | 5874cfed0b04f53146f70a519a2371cea5f39178 (patch) | |
| tree | d99173f58d0d95e0cc19bb53f6c298a03d9180d9 /drivers | |
| parent | 850ebc0c0c50e24126461eec3ca4d07308560058 (diff) | |
| parent | e4cf39ea473329dfc07de1246f97d27b7fc96f79 (diff) | |
Merge tag 'fbdev-fixes-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux
Pull fbdev fixes from Tomi Valkeinen:
"Minor fixes for amba-clcd and video DT bindings"
* tag 'fbdev-fixes-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux:
video: ARM CLCD: Fix color model capabilities for DT platforms
video: fix composite video connector compatible string
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/fbdev/amba-clcd.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/video/fbdev/amba-clcd.c b/drivers/video/fbdev/amba-clcd.c index a7b6217ac87b..6ad23bd3523a 100644 --- a/drivers/video/fbdev/amba-clcd.c +++ b/drivers/video/fbdev/amba-clcd.c @@ -639,9 +639,7 @@ static int clcdfb_of_init_tft_panel(struct clcd_fb *fb, u32 r0, u32 g0, u32 b0) if (g0 != panels[i].g0) continue; if (r0 == panels[i].r0 && b0 == panels[i].b0) - fb->panel->caps = panels[i].caps & CLCD_CAP_RGB; - if (r0 == panels[i].b0 && b0 == panels[i].r0) - fb->panel->caps = panels[i].caps & CLCD_CAP_BGR; + fb->panel->caps = panels[i].caps; } return fb->panel->caps ? 0 : -EINVAL; |