diff options
8 files changed, 286 insertions, 0 deletions
@@ -210,6 +210,8 @@ usb/usb-usb-serial-replace-shutdown-with-disconnect-release.patch usb/usb-add-intel-langwell-usb-device-controller-driver.patch usb/usb-add-intel-langwell-usb-otg-transceiver-drive.patch usb/usb-avoid-pm-error-messages-during-resume-if-a-device-was-disconnected.patch +usb/usb-atmel_usba_udc-change-way-of-specifying-bias-function.patch +usb/usb-usbtest-fix-endless-loop-in-unlink-tests.patch # USB 3.0 support!!! usb/usb-xhci-support-xhci-host-controllers-and-usb-3.0-devices.patch @@ -262,6 +264,7 @@ usb/usb-xhci-depends-on-pci.patch ################################# # for before .30 is done: +staging/staging-add-mailing-list-address-for-staging-tree.patch # for after .30: staging/staging-comedi-remove-ni_board-typedef.patch @@ -369,6 +372,7 @@ staging/staging-comedi-remove-min-macro.patch staging/staging-comedi-move-pcm-do_cmdtest-function-into-a-single-source-file.patch staging/staging-comedi-usbdux-buffer-overflow-error-handling.patch staging/staging-comedi-cb_pcidas.c-fix-build-warning.patch +staging/staging-comedi-uses-udelay-needs-delay.h.patch staging/staging-agnx-probe-cleanup.patch staging/staging-agnx-remove-memlens-from-probe.patch @@ -426,6 +430,7 @@ staging/staging-wlan-ng-move-firmware-loading-into-driver.patch staging/staging-wlan-ng-change-kern_debug-or-pr_debug-to-match-orig-driver.patch staging/staging-wlan-ng-p80211wext.c-problem-with-iw_encode_alg_wep.patch staging/staging-wlan-ng-lindent-cleanups.patch +staging/staging-wlan-ng-update-readme-file.-remove-lindent-task.patch staging/staging-pohmelfs-move-open-brace-to-same-line-on-structs.patch staging/staging-pohmelfs-remove-c99-comments.patch @@ -547,6 +552,7 @@ staging/staging-vt6655-replace-net_device-priv-accesses-with-netdev_priv-calls.p staging/staging-vt6655-remove-linux_version_code-preprocessor-conditionals.patch staging/staging-vt6655-use-net_device_ops-for-management-functions.patch staging/staging-vt6655-integrate-drivers-staging-vt6655-into-build-system.patch +staging/staging-vt6655-uses-pci-functions-should-depend-on-pci.patch staging/staging-android-lowmemorykiller-only-iterate-over-process-list-when-needed.patch staging/staging-android-lowmemorykiller-don-t-count-free-space-unless-it-meets-the-specified-limit-by-itself.patch @@ -574,6 +580,7 @@ staging/staging-cpc-usb-fix-build-warnings.patch staging/staging-add-rtl8192su-wireless-usb-driver.patch staging/staging-rtl8192su-fix-build-warnings.patch +staging/staging-rtl8192su-correct-use-of-and.patch staging/staging-wis-sony-tuner.c-fix-error.patch staging/staging-b3dfg-clean-up-module_parm_desc-newline.patch diff --git a/staging/staging-add-mailing-list-address-for-staging-tree.patch b/staging/staging-add-mailing-list-address-for-staging-tree.patch new file mode 100644 index 00000000000000..f5027b474aba8b --- /dev/null +++ b/staging/staging-add-mailing-list-address-for-staging-tree.patch @@ -0,0 +1,23 @@ +From foo@baz Fri Jun 5 11:23:47 PDT 2009 +Date: Fri, 05 Jun 2009 11:23:47 -0700 +To: Greg KH <greg@kroah.com> +From: Greg Kroah-Hartman <gregkh@suse.de> +Subject: Staging: add mailing list address for staging tree + + +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + MAINTAINERS | 1 + + 1 file changed, 1 insertion(+) + +--- a/MAINTAINERS ++++ b/MAINTAINERS +@@ -5383,6 +5383,7 @@ P: Greg Kroah-Hartman + M: gregkh@suse.de + L: linux-kernel@vger.kernel.org + T: quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/ ++L: devel@driverdev.osuosl.org + S: Maintained + F: drivers/staging/ + diff --git a/staging/staging-comedi-uses-udelay-needs-delay.h.patch b/staging/staging-comedi-uses-udelay-needs-delay.h.patch new file mode 100644 index 00000000000000..255abff3163718 --- /dev/null +++ b/staging/staging-comedi-uses-udelay-needs-delay.h.patch @@ -0,0 +1,33 @@ +From randy.dunlap@oracle.com Fri Jun 5 11:15:53 2009 +From: Randy Dunlap <randy.dunlap@oracle.com> +Date: Fri, 05 Jun 2009 11:10:42 -0700 +Subject: Staging: comedi: uses udelay, needs delay.h +To: <devel@driverdev.osuosl.org> +Cc: Greg KH <gregkh@suse.de> +Message-ID: <4A295FA2.1060401@oracle.com> + + +From: Randy Dunlap <randy.dunlap@oracle.com> + +comedi driver(s) use udelay() so they need to #include delay.h. + +drivers/staging/comedi/drivers/adq12b.c: In function 'adq12b_ai_rinsn': +drivers/staging/comedi/drivers/adq12b.c:328: error: implicit declaration of function 'udelay' + +Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/staging/comedi/comedidev.h | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/staging/comedi/comedidev.h ++++ b/drivers/staging/comedi/comedidev.h +@@ -28,6 +28,7 @@ + #include <linux/module.h> + #include <linux/kdev_t.h> + #include <linux/slab.h> ++#include <linux/delay.h> + #include <linux/errno.h> + #include <linux/spinlock.h> + #include <linux/mutex.h> diff --git a/staging/staging-rtl8192su-correct-use-of-and.patch b/staging/staging-rtl8192su-correct-use-of-and.patch new file mode 100644 index 00000000000000..7d750e3ef3a40f --- /dev/null +++ b/staging/staging-rtl8192su-correct-use-of-and.patch @@ -0,0 +1,40 @@ +From julia@diku.dk Fri Jun 5 11:16:52 2009 +From: Julia Lawall <julia@diku.dk> +Date: Fri, 5 Jun 2009 17:07:38 +0200 (CEST) +Subject: Staging: rtl8192su: Correct use of ! and & +To: gregkh@suse.de +Message-ID: <Pine.LNX.4.64.0906051706450.3477@ask.diku.dk> + + +From: Julia Lawall <julia@diku.dk> + +Correct priority problem in the use of ! and &. + +The semantic patch that makes this change is as follows: +(http://www.emn.fr/x-info/coccinelle/) + +// <smpl> +@@ expression E; constant C; @@ +- !E & C ++ !(E & C) +// </smpl> + +Signed-off-by: Julia Lawall <julia@diku.dk> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + + +--- + drivers/staging/rtl8192su/ieee80211/ieee80211_wx.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/staging/rtl8192su/ieee80211/ieee80211_wx.c ++++ b/drivers/staging/rtl8192su/ieee80211/ieee80211_wx.c +@@ -843,7 +843,7 @@ int ieee80211_wx_get_encode_ext(struct i + } else + idx = ieee->tx_keyidx; + +- if (!ext->ext_flags & IW_ENCODE_EXT_GROUP_KEY && ++ if (!(ext->ext_flags & IW_ENCODE_EXT_GROUP_KEY) && + ext->alg != IW_ENCODE_ALG_WEP) + if (idx != 0 || ieee->iw_mode != IW_MODE_INFRA) + return -EINVAL; diff --git a/staging/staging-vt6655-uses-pci-functions-should-depend-on-pci.patch b/staging/staging-vt6655-uses-pci-functions-should-depend-on-pci.patch new file mode 100644 index 00000000000000..f7e6f5abe81476 --- /dev/null +++ b/staging/staging-vt6655-uses-pci-functions-should-depend-on-pci.patch @@ -0,0 +1,31 @@ +From randy.dunlap@oracle.com Fri Jun 5 11:15:30 2009 +From: Randy Dunlap <randy.dunlap@oracle.com> +Date: Fri, 05 Jun 2009 11:12:03 -0700 +Subject: Staging: vt6655: uses pci functions, should depend on PCI +To: <devel@driverdev.osuosl.org> +Cc: Greg KH <gregkh@suse.de> +Message-ID: <4A295FF3.6060706@oracle.com> + + +From: Randy Dunlap <randy.dunlap@oracle.com> + +This driver uses lots of pci_*() calls, so it should depend on PCI. + +drivers/staging/vt6655/device_main.c:3942: error: implicit declaration of function 'pci_dev_driver' + +Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/staging/vt6655/Kconfig | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/staging/vt6655/Kconfig ++++ b/drivers/staging/vt6655/Kconfig +@@ -1,5 +1,6 @@ + config VT6655 + tristate "VIA Technologies VT6655 support" ++ depends on PCI + ---help--- + This is a vendor-written driver for VIA VT6655. + diff --git a/staging/staging-wlan-ng-update-readme-file.-remove-lindent-task.patch b/staging/staging-wlan-ng-update-readme-file.-remove-lindent-task.patch new file mode 100644 index 00000000000000..bcf7cb64c10001 --- /dev/null +++ b/staging/staging-wlan-ng-update-readme-file.-remove-lindent-task.patch @@ -0,0 +1,27 @@ +From mithlesh@linsyssoft.com Fri Jun 5 11:17:53 2009 +From: Mithlesh Thukral <mithlesh@linsyssoft.com> +Date: Fri, 5 Jun 2009 15:33:59 +0530 (IST) +Subject: Staging: wlan-ng: Update README file. Remove Lindent task +To: Greg Kroah-Hartman <gregkh@suse.de> +Message-ID: <alpine.LFD.2.00.0906051533170.16520@localhost.localdomain> + + +Remove Lindent changes as a TODO item in the wlan-ng directory of staging tree. + +Signed-off-by: Mithlesh Thukral <mithlesh@linsyssoft.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/staging/wlan-ng/README | 1 - + 1 file changed, 1 deletion(-) + +--- a/drivers/staging/wlan-ng/README ++++ b/drivers/staging/wlan-ng/README +@@ -1,7 +1,6 @@ + TODO: + - checkpatch.pl cleanups + - sparse warnings +- - Lindent cleanups + - move to use the in-kernel wireless stack + + Please send any patches or complaints about this driver to Greg diff --git a/usb/usb-atmel_usba_udc-change-way-of-specifying-bias-function.patch b/usb/usb-atmel_usba_udc-change-way-of-specifying-bias-function.patch new file mode 100644 index 00000000000000..9bdab993a6b2b7 --- /dev/null +++ b/usb/usb-atmel_usba_udc-change-way-of-specifying-bias-function.patch @@ -0,0 +1,55 @@ +From nicolas.ferre@atmel.com Fri Jun 5 11:16:16 2009 +From: Nicolas Ferre <nicolas.ferre@atmel.com> +Date: Fri, 5 Jun 2009 17:46:16 +0200 +Subject: USB: atmel_usba_udc: change way of specifying bias function +Cc: david-b@pacbell.net, haavard.skinnemoen@atmel.com, patrice.vilchez@atmel.com, Nicolas Ferre <nicolas.ferre@atmel.com> +Message-ID: <1244216776-22760-1-git-send-email-nicolas.ferre@atmel.com> + +From: Nicolas Ferre <nicolas.ferre@atmel.com> + +The toggle_bias() function was specified differently for avr32 and at91 +architectures. Now, new at91 have the same behavior as avr32. +Consequently, we change to a particular chip function definition: only for +at91sam9rl. + +Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> +Acked-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com> +Acked-by: David Brownell <dbrownell@users.sourceforge.net> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/usb/gadget/atmel_usba_udc.c | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +--- a/drivers/usb/gadget/atmel_usba_udc.c ++++ b/drivers/usb/gadget/atmel_usba_udc.c +@@ -326,13 +326,7 @@ static int vbus_is_present(struct usba_u + return 1; + } + +-#if defined(CONFIG_AVR32) +- +-static void toggle_bias(int is_on) +-{ +-} +- +-#elif defined(CONFIG_ARCH_AT91) ++#if defined(CONFIG_ARCH_AT91SAM9RL) + + #include <mach/at91_pmc.h> + +@@ -346,7 +340,13 @@ static void toggle_bias(int is_on) + at91_sys_write(AT91_CKGR_UCKR, uckr & ~(AT91_PMC_BIASEN)); + } + +-#endif /* CONFIG_ARCH_AT91 */ ++#else ++ ++static void toggle_bias(int is_on) ++{ ++} ++ ++#endif /* CONFIG_ARCH_AT91SAM9RL */ + + static void next_fifo_transaction(struct usba_ep *ep, struct usba_request *req) + { diff --git a/usb/usb-usbtest-fix-endless-loop-in-unlink-tests.patch b/usb/usb-usbtest-fix-endless-loop-in-unlink-tests.patch new file mode 100644 index 00000000000000..a7c5193e279da9 --- /dev/null +++ b/usb/usb-usbtest-fix-endless-loop-in-unlink-tests.patch @@ -0,0 +1,70 @@ +From mfuzzey@gmail.com Fri Jun 5 11:17:20 2009 +From: Martin Fuzzey <mfuzzey@gmail.com> +Date: Thu, 04 Jun 2009 23:20:38 +0200 +Subject: USB: usbtest fix endless loop in unlink tests. +Message-ID: <20090604212038.19162.36564.stgit@srv002.fuzzey.net> + + +In tests 11 and 12 if the URB completes with an error status (eg babble) +the asynchrous unlink entered an endless loop trying to unlink +a non resubmitted URB. + +Signed-off-by: Martin Fuzzey <mfuzzey@gmail.com> +Acked-by: David Brownell <david-b@pacbell.net> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/usb/misc/usbtest.c | 39 +++++++++++++++++++++++++-------------- + 1 file changed, 25 insertions(+), 14 deletions(-) + +--- a/drivers/usb/misc/usbtest.c ++++ b/drivers/usb/misc/usbtest.c +@@ -1072,23 +1072,34 @@ static int unlink1 (struct usbtest_dev * + */ + msleep (jiffies % (2 * INTERRUPT_RATE)); + if (async) { +-retry: +- retval = usb_unlink_urb (urb); +- if (retval == -EBUSY || retval == -EIDRM) { +- /* we can't unlink urbs while they're completing. +- * or if they've completed, and we haven't resubmitted. +- * "normal" drivers would prevent resubmission, but +- * since we're testing unlink paths, we can't. +- */ +- ERROR(dev, "unlink retry\n"); +- goto retry; ++ while (!completion_done(&completion)) { ++ retval = usb_unlink_urb(urb); ++ ++ switch (retval) { ++ case -EBUSY: ++ case -EIDRM: ++ /* we can't unlink urbs while they're completing ++ * or if they've completed, and we haven't ++ * resubmitted. "normal" drivers would prevent ++ * resubmission, but since we're testing unlink ++ * paths, we can't. ++ */ ++ ERROR(dev, "unlink retry\n"); ++ continue; ++ case 0: ++ case -EINPROGRESS: ++ break; ++ ++ default: ++ dev_err(&dev->intf->dev, ++ "unlink fail %d\n", retval); ++ return retval; ++ } ++ ++ break; + } + } else + usb_kill_urb (urb); +- if (!(retval == 0 || retval == -EINPROGRESS)) { +- dev_err(&dev->intf->dev, "unlink fail %d\n", retval); +- return retval; +- } + + wait_for_completion (&completion); + retval = urb->status; |