diff --git a/kernel.spec b/kernel.spec index f5f9f4792..2f5a0c7e8 100644 --- a/kernel.spec +++ b/kernel.spec @@ -51,7 +51,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be prepended with "0.", so # for example a 3 here will become 0.3 # -%global baserelease 1 +%global baserelease 2 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -686,6 +686,8 @@ Patch12019: linux-2.6-rt2x00-Add-device-ID-for-RT539F-device.patch Patch12020: linux-2.6-zd1211rw-fix-invalid-signal-values-from-device.patch +Patch12021: udlfb-bind-framebuffer-to-interface.patch + # Runtime power management Patch12203: linux-2.6-usb-pci-autosuspend.patch Patch12204: linux-2.6-enable-more-pci-autosuspend.patch @@ -1264,6 +1266,8 @@ ApplyPatch neuter_intel_microcode_load.patch ApplyPatch linux-2.6-rt2x00-Add-device-ID-for-RT539F-device.patch +ApplyPatch udlfb-bind-framebuffer-to-interface.patch + # Runtime PM #ApplyPatch linux-2.6-usb-pci-autosuspend.patch ### Broken by implicit notify support & ACPICA rebase @@ -1885,6 +1889,9 @@ fi # and build. %changelog +* Thu Jul 28 2011 Josh Boyer +- Backport patch to correct udlfb removal events (rhbz 726163) + * Wed Jul 27 2011 Dave Jones - Turn off debug builds. diff --git a/udlfb-bind-framebuffer-to-interface.patch b/udlfb-bind-framebuffer-to-interface.patch new file mode 100644 index 000000000..1c5c6df9b --- /dev/null +++ b/udlfb-bind-framebuffer-to-interface.patch @@ -0,0 +1,33 @@ +From c91a793f66d5b06292aa431ae3a36c8aca991fa3 Mon Sep 17 00:00:00 2001 +From: Kay Sievers +Date: Tue, 5 Jul 2011 17:04:11 -0700 +Subject: [PATCH] drivers/video/udlfb bind framebuffer to interface. + +Udlfb has been binding the framebuffer device to its parent, which +isn't correct and causes confusion with operations like udev remove. + +Coming plug and play multiseat support is dependent on this fix. + +Signed-off-by: Kay Sievers +Signed-off-by: Bernie Thompson +Signed-off-by: Paul Mundt +--- + drivers/video/udlfb.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/drivers/video/udlfb.c b/drivers/video/udlfb.c +index 816a4fd..c6584c9 100644 +--- a/drivers/video/udlfb.c ++++ b/drivers/video/udlfb.c +@@ -1549,7 +1549,7 @@ static int dlfb_usb_probe(struct usb_interface *interface, + /* We don't register a new USB class. Our client interface is fbdev */ + + /* allocates framebuffer driver structure, not framebuffer memory */ +- info = framebuffer_alloc(0, &usbdev->dev); ++ info = framebuffer_alloc(0, &interface->dev); + if (!info) { + retval = -ENOMEM; + pr_err("framebuffer_alloc failed\n"); +-- +1.7.4.4 +