From: Dave Airlie <airlied@redhat.com>
Date: Fri, 8 Feb 2013 02:14:50 +0000 (+1000)
Subject: Merge branch 'udl-fixes' into drm-next
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=bb0f78dd7ded88082b2430c43c65bc821c4ea360;p=linux-beck.git

Merge branch 'udl-fixes' into drm-next

Fixes for usb/udl devices
* udl-fixes:
  drm/udl: disable fb_defio by default
  drm/udl: Inline memcmp() for RLE compression of xfer
  drm/udl: make usage as a console safer
  drm/usb: bind driver to correct device
---

bb0f78dd7ded88082b2430c43c65bc821c4ea360
diff --cc drivers/gpu/drm/udl/udl_fb.c
index caa84f1de9c1,1eb060cc71d1..b9feec9d08d3
--- a/drivers/gpu/drm/udl/udl_fb.c
+++ b/drivers/gpu/drm/udl/udl_fb.c
@@@ -433,9 -469,10 +468,10 @@@ udl_framebuffer_init(struct drm_device 
  {
  	int ret;
  
+ 	spin_lock_init(&ufb->dirty_lock);
  	ufb->obj = obj;
 -	ret = drm_framebuffer_init(dev, &ufb->base, &udlfb_funcs);
  	drm_helper_mode_fill_fb_struct(&ufb->base, mode_cmd);
 +	ret = drm_framebuffer_init(dev, &ufb->base, &udlfb_funcs);
  	return ret;
  }