From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 23 Mar 2012 03:43:40 +0000 (-0700)
Subject: Merge tag 'fbdev-updates-for-3.4' of git://github.com/schandinat/linux-2.6
X-Git-Tag: v3.4-rc1~125
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=437538267b672f9320833907f1b5acbb2605f4be;p=profile%2Fcommon%2Fkernel-common.git

Merge tag 'fbdev-updates-for-3.4' of git://github.com/schandinat/linux-2.6

Pull fbdev updates for 3.4 from Florian Tobias Schandinat:
 - drivers for Samsung Exynos MIPI DSI and display port
 - i740fb to support those old Intel chips
 - large updates to OMAP, viafb and sh_mobile_lcdcfb
 - some updates to s3c-fb and udlfb, few patches to others

Fix up conflicts in drivers/video/udlfb.c due to Key Sievers' fix making
it in twice.

* tag 'fbdev-updates-for-3.4' of git://github.com/schandinat/linux-2.6: (156 commits)
  Revert "video:uvesafb: Fix oops that uvesafb try to execute NX-protected page"
  OMAPDSS: register dss drivers in module init
  video: pxafb: add clk_prepare/clk_unprepare calls
  fbdev: bfin_adv7393fb: Drop needless include
  fbdev: sh_mipi_dsi: add extra phyctrl for sh_mipi_dsi_info
  fbdev: remove dependency of FB_SH_MOBILE_MERAM from FB_SH_MOBILE_LCDC
  Revert "MAINTAINERS: add entry for exynos mipi display drivers"
  fbdev: da8xx: add support for SP10Q010 display
  fbdev: da8xx:: fix reporting of the display timing info
  drivers/video/pvr2fb.c: ensure arguments to request_irq and free_irq are compatible
  OMAPDSS: APPLY: fix clearing shadow dirty flag with manual update
  fbdev: sh_mobile_meram: Implement system suspend/resume
  fbdev: sh_mobile_meram: Remove unneeded sanity checks
  fbdev: sh_mobile_meram: Don't perform update in register operation
  arm: mach-shmobile: Constify sh_mobile_meram_cfg structures
  fbdev: sh_mobile_lcdc: Don't store copy of platform data
  fbdev: sh_mobile_meram: Remove unused sh_mobile_meram_icb_cfg fields
  arm: mach-shmobile: Don't set MERAM ICB numbers in platform data
  fbdev: sh_mobile_meram: Allocate ICBs automatically
  fbdev: sh_mobile_meram: Use genalloc to manage MERAM allocation
  ...
---

437538267b672f9320833907f1b5acbb2605f4be
diff --cc drivers/video/udlfb.c
index a40c05e,157df78..a159b63
--- a/drivers/video/udlfb.c
+++ b/drivers/video/udlfb.c
@@@ -1735,12 -1749,24 +1749,20 @@@ static void dlfb_usb_disconnect(struct 
  	/* When non-active we'll update virtual framebuffer, but no new urbs */
  	atomic_set(&dev->usb_active, 0);
  
- 	/* remove udlfb's sysfs interfaces */
- 	for (i = 0; i < ARRAY_SIZE(fb_device_attrs); i++)
- 		device_remove_file(info->dev, &fb_device_attrs[i]);
- 	device_remove_bin_file(info->dev, &edid_attr);
- 	unlink_framebuffer(info);
+ 	/* this function will wait for all in-flight urbs to complete */
+ 	dlfb_free_urb_list(dev);
+ 
+ 	if (info) {
 -
+ 		/* remove udlfb's sysfs interfaces */
+ 		for (i = 0; i < ARRAY_SIZE(fb_device_attrs); i++)
+ 			device_remove_file(info->dev, &fb_device_attrs[i]);
+ 		device_remove_bin_file(info->dev, &edid_attr);
 -
 -		/* it's safe to uncomment next line if your kernel
 -		   doesn't yet have this function exported */
+ 		unlink_framebuffer(info);
+ 	}
+ 
  	usb_set_intfdata(interface, NULL);
+ 	dev->udev = NULL;
+ 	dev->gdev = NULL;
  
  	/* if clients still have us open, will be freed on last close */
  	if (dev->fb_count == 0)