From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 19 Oct 2014 01:03:02 +0000 (-0700)
Subject: Merge tag 'fbdev-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux
X-Git-Tag: MMI-PSA29.97-13-9~11310
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0a582821d4f8edf41d9b56ae057ee2002fc275f0;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge tag 'fbdev-3.18' of git://git./linux/kernel/git/tomba/linux

Pull fbdev updates from Tomi Valkeinen:
 - new 6x10 font
 - various small fixes and cleanups

* tag 'fbdev-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux: (30 commits)
  fonts: Add 6x10 font
  videomode: provide dummy inline functions for !CONFIG_OF
  video/atmel_lcdfb: Introduce regulator support
  fbdev: sh_mobile_hdmi: Re-init regs before irq re-enable on resume
  framebuffer: fix screen corruption when copying
  framebuffer: fix border color
  arm, fbdev, omap2, LLVMLinux: Remove nested function from omapfb
  arm, fbdev, omap2, LLVMLinux: Remove nested function from omap2 dss
  video: fbdev: valkyriefb.c: use container_of to resolve fb_info_valkyrie from fb_info
  video: fbdev: pxafb.c: use container_of to resolve pxafb_info/layer from fb_info
  video: fbdev: cyber2000fb.c: use container_of to resolve cfb_info from fb_info
  video: fbdev: controlfb.c: use container_of to resolve fb_info_control from fb_info
  video: fbdev: sa1100fb.c: use container_of to resolve sa1100fb_info from fb_info
  video: fbdev: stifb.c: use container_of to resolve stifb_info from fb_info
  video: fbdev: sis: sis_main.c: Cleaning up missing null-terminate in conjunction with strncpy
  video: valkyriefb: Fix unused variable warning in set_valkyrie_clock()
  video: fbdev: use %*ph specifier to dump small buffers
  video: mx3fb: always enable BACKLIGHT_LCD_SUPPORT
  video: fbdev: au1200fb: delete double assignment
  video: fbdev: sis: delete double assignment
  ...
---

0a582821d4f8edf41d9b56ae057ee2002fc275f0
diff --cc drivers/video/of_display_timing.c
index 5c098d5b4043,339f831c8412..32d8275e4c88
--- a/drivers/video/of_display_timing.c
+++ b/drivers/video/of_display_timing.c
@@@ -233,10 -233,8 +233,9 @@@ struct display_timings *of_get_display_
  	return disp;
  
  timingfail:
- 	if (native_mode)
- 		of_node_put(native_mode);
+ 	of_node_put(native_mode);
  	display_timings_release(disp);
 +	disp = NULL;
  entryfail:
  	kfree(disp);
  dispfail: