diff options
8 files changed, 217 insertions, 17 deletions
diff --git a/driver-core.current/driver-core-prevent-device_for_each_child-from-oopsing.patch b/driver-core.current/driver-core-prevent-device_for_each_child-from-oopsing.patch new file mode 100644 index 00000000000000..c3db4879d75e3f --- /dev/null +++ b/driver-core.current/driver-core-prevent-device_for_each_child-from-oopsing.patch @@ -0,0 +1,30 @@ +From foo@baz Wed Apr 15 16:00:12 PDT 2009 +Date: Wed, 15 Apr 2009 16:00:12 -0700 +To: Greg KH <greg@kroah.com> +From: Greg Kroah-Hartman <gregkh@suse.de> +Subject: driver core: prevent device_for_each_child from oopsing + +David Vrabel noticed that the wireless usb stack likes to call +device_for_each_chile() with an empty bus. This used to work fine, but +now oopses. This patch fixes the oops and makes the code behave like it +used to. + +Reported-by: David Vrabel <david.vrabel@csr.com> +Tested-by: David Vrabel <david.vrabel@csr.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> +--- + drivers/base/core.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/drivers/base/core.c ++++ b/drivers/base/core.c +@@ -1142,6 +1142,9 @@ int device_for_each_child(struct device + struct device *child; + int error = 0; + ++ if (!parent->p) ++ return 0; ++ + klist_iter_init(&parent->p->klist_children, &i); + while ((child = next_device(&i)) && !error) + error = fn(child, data); diff --git a/driver-core.current/driver-core-remove-pr_fmt-from-dynamic_dev_dbg-printk.patch b/driver-core.current/driver-core-remove-pr_fmt-from-dynamic_dev_dbg-printk.patch new file mode 100644 index 00000000000000..a4a2d141b0db66 --- /dev/null +++ b/driver-core.current/driver-core-remove-pr_fmt-from-dynamic_dev_dbg-printk.patch @@ -0,0 +1,32 @@ +From jbaron@redhat.com Wed Apr 15 16:14:07 2009 +From: Jason Baron <jbaron@redhat.com> +Date: Wed, 8 Apr 2009 12:12:52 -0400 +Subject: Driver core: remove pr_fmt() from dynamic_dev_dbg() printk +To: greg@kroah.com +Cc: <gnb@sgi.com> +Message-ID: <20090408161252.GA3125@redhat.com> + + +When pr_fmt() was added to the pr_debug() code, we added it not only to the +dynamic_pr_debug() function, but also to the dynamic_dev_dbg() funciton. +However, dev_dbg() doesn't make use of pr_fmt(), so neither should +dynamic_dev_dbg(). + +Signed-off-by: Jason Baron <jbaron@redhat.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + include/linux/dynamic_debug.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/include/linux/dynamic_debug.h ++++ b/include/linux/dynamic_debug.h +@@ -70,7 +70,7 @@ extern int ddebug_remove_module(char *mo + DEBUG_HASH2, __LINE__, _DPRINTK_FLAGS_DEFAULT }; \ + if (__dynamic_dbg_enabled(descriptor)) \ + dev_printk(KERN_DEBUG, dev, \ +- KBUILD_MODNAME ": " pr_fmt(fmt),\ ++ KBUILD_MODNAME ": " fmt, \ + ##__VA_ARGS__); \ + } while (0) + diff --git a/driver-core.current/uio-fix-specific-device-driver-missing-statement-for-depmod.patch b/driver-core.current/uio-fix-specific-device-driver-missing-statement-for-depmod.patch new file mode 100644 index 00000000000000..0ec0a3dd1943c1 --- /dev/null +++ b/driver-core.current/uio-fix-specific-device-driver-missing-statement-for-depmod.patch @@ -0,0 +1,34 @@ +From hjk@linutronix.de Wed Apr 15 16:18:40 2009 +From: "Hans J. Koch" <hjk@linutronix.de> +Date: Sat, 11 Apr 2009 04:18:25 +0200 +Subject: UIO: fix specific device driver missing statement for depmod +To: Andrew Morton <akpm@linux-foundation.org> +Cc: hjk@linutronix.de, Greg KH <greg@kroah.com> +Message-ID: <20090411021813.GA3651@local> +Content-Disposition: inline + + +On Fri, Apr 10, 2009 at 01:50:50PM -0700, Andrew Morton wrote: +> On Fri, 10 Apr 2009 13:32:01 GMT +> bugzilla-daemon@bugzilla.kernel.org wrote: +> +> > http://bugzilla.kernel.org/show_bug.cgi?id=13059 + +drivers/uio/uio_cif.c misses a MODULE_DEVICE_TABLE, this fixes it. + +Signed-off-by: Hans J. Koch <hjk@linutronix.de> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/uio/uio_cif.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/uio/uio_cif.c ++++ b/drivers/uio/uio_cif.c +@@ -147,5 +147,6 @@ static void __exit hilscher_exit_module( + module_init(hilscher_init_module); + module_exit(hilscher_exit_module); + ++MODULE_DEVICE_TABLE(pci, hilscher_pci_ids); + MODULE_LICENSE("GPL v2"); + MODULE_AUTHOR("Hans J. Koch, Benedikt Spranger"); diff --git a/f.patch b/f.patch deleted file mode 100644 index 3ba51fe9322b1e..00000000000000 --- a/f.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- - drivers/base/core.c | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/drivers/base/core.c -+++ b/drivers/base/core.c -@@ -1142,6 +1142,9 @@ int device_for_each_child(struct device - struct device *child; - int error = 0; - -+ if (!parent->p) -+ return 0; -+ - klist_iter_init(&parent->p->klist_children, &i); - while ((child = next_device(&i)) && !error) - error = fn(child, data); @@ -16,6 +16,9 @@ driver-core.current/sysfs-sysfs-poll-keep-the-poll-rule-of-regular-file.patch driver-core.current/proc-mounts_poll-make-consistent-to-mdstat_poll.patch driver-core.current/driver-core-early-platform-driver.patch driver-core.current/dynamic-debug-resurrect-old-pr_debug-semantics-as-pr_devel.patch +driver-core.current/driver-core-prevent-device_for_each_child-from-oopsing.patch +driver-core.current/driver-core-remove-pr_fmt-from-dynamic_dev_dbg-printk.patch +driver-core.current/uio-fix-specific-device-driver-missing-statement-for-depmod.patch ################################# @@ -35,6 +38,8 @@ usb.current/usb-musb-fix-isochronous-txdma.patch usb.current/usb-musb-fix-possible-panic-while-resuming.patch usb.current/revert-usb-usb-serial-ch341-support-for-dtr-rts-cts.patch usb.current/usb-usb-serial-ch341-support-for-dtr-rts-cts.patch +usb.current/usb-storage-fix-mistake-in-makefile.patch +usb.current/usb-add-device-id-for-motorola-v950-renegade-phone.patch ##################################################################### # Stuff to be merged after 2.6.30 is out @@ -103,6 +108,7 @@ staging/staging-sxg-fix-sleep-in-atomic-context-warning-while-loading-driver.pat staging/staging-sxg-fix-leaks-and-checksum-errors-in-transmit-code-path.patch staging/staging-go7007-fix-build-issues.patch +staging/staging-otus-zdusb.c-additional-usb-idnetifier.patch # for after .30: @@ -115,4 +121,4 @@ staging/staging-go7007-fix-build-issues.patch #staging/staging-add-intel-poulsbo-morrestown-drm-driver.patch -f.patch + diff --git a/staging/staging-otus-zdusb.c-additional-usb-idnetifier.patch b/staging/staging-otus-zdusb.c-additional-usb-idnetifier.patch new file mode 100644 index 00000000000000..6d7e3edc1302bd --- /dev/null +++ b/staging/staging-otus-zdusb.c-additional-usb-idnetifier.patch @@ -0,0 +1,46 @@ +From akpm@linux-foundation.org Wed Apr 15 16:20:44 2009 +From: Daniele Napolitano <dnax88@gmail.com> +Date: Tue, 14 Apr 2009 16:58:33 -0700 +Subject: Staging: otus/zdusb.c: additional USB idnetifier +To: mm-commits@vger.kernel.org +Cc: dnax88@gmail.com, greg@kroah.com +Message-ID: <200904142358.n3ENwXBD006943@imap1.linux-foundation.org> + + +Subject: otus/zdusb.c: additional USB idnetifier +From: Daniele Napolitano <dnax88@gmail.com> + +Provide support for WN111v2 USB 802.11n adapter. + +Signed-off-by: Daniele Napolitano <dnax88@gmail.com> +Signed-off-by: Andrew Morton <akpm@linux-foundation.org> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/staging/otus/zdusb.c | 3 ++- + drivers/staging/otus/zdusb.h | 4 ++++ + 2 files changed, 6 insertions(+), 1 deletion(-) + +--- a/drivers/staging/otus/zdusb.c ++++ b/drivers/staging/otus/zdusb.c +@@ -48,7 +48,8 @@ static const char driver_name[] = "Otus" + static struct usb_device_id zd1221_ids [] = { + { USB_DEVICE(VENDOR_ATHR, PRODUCT_AR9170) }, + { USB_DEVICE(VENDOR_DLINK, PRODUCT_DWA160A) }, +- { USB_DEVICE(0x0846, 0x9010) }, ++ { USB_DEVICE(VENDOR_NETGEAR, PRODUCT_WNDA3100) }, ++ { USB_DEVICE(VENDOR_NETGEAR, PRODUCT_WN111v2) }, + { } /* Terminating entry */ + }; + +--- a/drivers/staging/otus/zdusb.h ++++ b/drivers/staging/otus/zdusb.h +@@ -40,4 +40,8 @@ + #define VENDOR_DLINK 0x07D1 //Dlink + #define PRODUCT_DWA160A 0x3C10 + ++#define VENDOR_NETGEAR 0x0846 /* NetGear */ ++#define PRODUCT_WNDA3100 0x9010 ++#define PRODUCT_WN111v2 0x9001 ++ + #endif diff --git a/usb.current/usb-add-device-id-for-motorola-v950-renegade-phone.patch b/usb.current/usb-add-device-id-for-motorola-v950-renegade-phone.patch new file mode 100644 index 00000000000000..8a38deb07cd06b --- /dev/null +++ b/usb.current/usb-add-device-id-for-motorola-v950-renegade-phone.patch @@ -0,0 +1,31 @@ +From dr.gregory.h.wettstein.phd@ndsu.edu Wed Apr 15 16:17:36 2009 +From: Dr. Greg Wettstein <greg@enjellic.com> +Date: Sat, 11 Apr 2009 09:12:08 -0500 +Subject: USB: Add device ID for Motorola v950 'Renegade' phone. +Subject: Re: USB device codes for Motorola phone. +To: Greg KH <greg@kroah.com> +Message-ID: <200904111412.n3BEC8vW007249@habu.cc.ndsu.nodak.edu> + +The v950 appears to be a ruggedized version of the Motorola Razor +phone. Tethering to the phone to use it in 'phone as modem' mode +requires the use of the specialized moto-modem driver which layers +over the usb-serial driver. Support for the v950 was added simply +adding the device ID's for the phone. + +Signed-off-by: Dr. Greg Wettstein <greg@enjellic.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/usb/serial/moto_modem.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/usb/serial/moto_modem.c ++++ b/drivers/usb/serial/moto_modem.c +@@ -25,6 +25,7 @@ static struct usb_device_id id_table [] + { USB_DEVICE(0x05c6, 0x3197) }, /* unknown Motorola phone */ + { USB_DEVICE(0x0c44, 0x0022) }, /* unknown Mororola phone */ + { USB_DEVICE(0x22b8, 0x2a64) }, /* Motorola KRZR K1m */ ++ { USB_DEVICE(0x22b8, 0x2c64) }, /* Motorola V950 phone */ + { }, + }; + MODULE_DEVICE_TABLE(usb, id_table); diff --git a/usb.current/usb-storage-fix-mistake-in-makefile.patch b/usb.current/usb-storage-fix-mistake-in-makefile.patch new file mode 100644 index 00000000000000..f2f736c8aab579 --- /dev/null +++ b/usb.current/usb-storage-fix-mistake-in-makefile.patch @@ -0,0 +1,37 @@ +From stern@rowland.harvard.edu Wed Apr 15 16:15:37 2009 +From: Alan Stern <stern@rowland.harvard.edu> +Date: Thu, 9 Apr 2009 14:59:44 -0400 (EDT) +Subject: usb-storage: fix mistake in Makefile +To: Greg KH <greg@kroah.com>, Matthew Dharm <mdharm-usb@one-eyed-alien.net> +Cc: Alan Jenkins <sourcejedi.lkml@googlemail.com>, Mike Galbraith <efault@gmx.de>, USB Storage list <usb-storage@lists.one-eyed-alien.net> +Message-ID: <Pine.LNX.4.44L0.0904091455440.2992-100000@iolanthe.rowland.org> + + +This patch (as1228) fixes a Makefile error introduced when the +subdrivers in usb-storage were split out into separate modules. The +intention is that when CONFIG_USB_LIBUSUAL is set, libusual.o and +usual-tables.o should be combined into a single object file (called +usb-libusual). The current Makefile will instead create two separate +objects, and the result won't load properly. + +Signed-off-by: Alan Stern <stern@rowland.harvard.edu> +Reported-and-tested-by: Alan Jenkins <sourcejedi.lkml@googlemail.com> +Reported-and-tested-by: Mike Galbraith <efault@gmx.de> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/usb/storage/Makefile | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/drivers/usb/storage/Makefile ++++ b/drivers/usb/storage/Makefile +@@ -17,7 +17,8 @@ usb-storage-objs := scsiglue.o protocol. + ifeq ($(CONFIG_USB_LIBUSUAL),) + usb-storage-objs += usual-tables.o + else +- obj-$(CONFIG_USB) += libusual.o usual-tables.o ++ obj-$(CONFIG_USB) += usb-libusual.o ++ usb-libusual-objs := libusual.o usual-tables.o + endif + + obj-$(CONFIG_USB_STORAGE_ALAUDA) += ums-alauda.o |