diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2011-07-29 10:12:47 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2011-07-29 10:12:47 -0400 |
| commit | 37a65c786830f35e8e20ea1da20800b94359a1c0 (patch) | |
| tree | 198b2d380d859d8b323532d0e57fc2838137f344 | |
| parent | 4e3ef443626c58b42f64f3ecd4b3092458f21305 (diff) | |
| download | kernel-37a65c786830f35e8e20ea1da20800b94359a1c0.tar.gz kernel-37a65c786830f35e8e20ea1da20800b94359a1c0.tar.xz kernel-37a65c786830f35e8e20ea1da20800b94359a1c0.zip | |
3.0-git11 snapshot
Add patch from linux-next to fix udlfb binding (rhbz 726163)
| -rw-r--r-- | config-generic | 1 | ||||
| -rw-r--r-- | kernel.spec | 10 | ||||
| -rw-r--r-- | sources | 2 | ||||
| -rw-r--r-- | udlfb-bind-framebuffer-to-interface.patch | 33 |
4 files changed, 44 insertions, 2 deletions
diff --git a/config-generic b/config-generic index a9aea5738..c16ee83c4 100644 --- a/config-generic +++ b/config-generic @@ -1478,6 +1478,7 @@ CONFIG_ATMEL=m CONFIG_B43=m CONFIG_B43_PCMCIA=y CONFIG_B43_SDIO=y +CONFIG_B43_BCMA=y CONFIG_B43_DEBUG=y CONFIG_B43_PHY_LP=y CONFIG_B43_PHY_N=y diff --git a/kernel.spec b/kernel.spec index 4c538137d..763d76909 100644 --- a/kernel.spec +++ b/kernel.spec @@ -84,7 +84,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 0 # The git snapshot level -%define gitrev 9 +%define gitrev 11 # Set rpm version accordingly %define rpmversion 3.%{upstream_sublevel}.0 %endif @@ -679,6 +679,8 @@ Patch12016: disable-i8042-check-on-apple-mac.patch Patch12018: neuter_intel_microcode_load.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 @@ -1252,6 +1254,8 @@ ApplyPatch add-appleir-usb-driver.patch ApplyPatch neuter_intel_microcode_load.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 @@ -1873,6 +1877,10 @@ fi # and build. %changelog +* Fri Jul 29 2011 Josh Boyer <jwboyer@redhat.com> +- Linux 3.0-git11 +- Backport patch to correct udlfb removal events (rhbz 726163) + * Thu Jul 28 2011 Dave Jones <davej@redhat.com> - module-init-tools needs to be a prereq not a conflict. @@ -1,2 +1,2 @@ 398e95866794def22b12dfbc15ce89c0 linux-3.0.tar.bz2 -4e5417eac273458e78fcb380e8996fec patch-3.0-git9.bz2 +f7c0bce1da05a9fde516132fa7f85256 patch-3.0-git11.bz2 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 <kay.sievers@vrfy.org> +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 <kay.sievers@vrfy.org> +Signed-off-by: Bernie Thompson <bernie@plugable.com> +Signed-off-by: Paul Mundt <lethal@linux-sh.org> +--- + 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 + |