aboutsummaryrefslogtreecommitdiffstats
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2010-10-20 14:28:49 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2010-10-20 14:28:49 -0700
commit11d0037694f985fe4e128d36f1c5dad6248e45d1 (patch)
tree3b05f0a08863911b63d1cf91c5d3abfb063ce95d
parentf55a50b5b2de0fb6e6532ae8b6effdc1851bd3e7 (diff)
downloadpatches-11d0037694f985fe4e128d36f1c5dad6248e45d1.tar.gz
more patches
Diffstat
-rw-r--r--driver-core/driver-core-display-error-codes-when-class-suspend-fails.patch40
-rw-r--r--series5
-rw-r--r--usb/usb-gadget-fix-kconfig-warning.patch47
-rw-r--r--usb/usb-imx21-hcd-fix-off-by-one-resource-size-calculation.patch26
-rw-r--r--usb/usb-r8a66597-udc-add-processing-when-usb-was-removed.patch40
5 files changed, 158 insertions, 0 deletions
diff --git a/driver-core/driver-core-display-error-codes-when-class-suspend-fails.patch b/driver-core/driver-core-display-error-codes-when-class-suspend-fails.patch
new file mode 100644
index 00000000000000..45181ce8f71c3a
--- /dev/null
+++ b/driver-core/driver-core-display-error-codes-when-class-suspend-fails.patch
@@ -0,0 +1,40 @@
+From broonie@opensource.wolfsonmicro.com Wed Oct 20 14:23:16 2010
+From: Mark Brown <broonie@opensource.wolfsonmicro.com>
+To: Greg Kroah-Hartman <gregkh@suse.de>
+Cc: linux-kernel@vger.kernel.org,
+ patches@opensource.wolfsonmicro.com,
+ Mark Brown <broonie@opensource.wolfsonmicro.com>
+Subject: [PATCH] driver core: Display error codes when class suspend fails
+Date: Wed, 20 Oct 2010 11:22:42 -0700
+Message-Id: <1287598962-28013-1-git-send-email-broonie@opensource.wolfsonmicro.com>
+
+Aid diagnostics by printing the error code from failed suspends, which
+doesn't otherwise seem to get displayed.
+
+Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/base/sys.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+--- a/drivers/base/sys.c
++++ b/drivers/base/sys.c
+@@ -432,13 +432,13 @@ int sysdev_suspend(pm_message_t state)
+ /* resume current sysdev */
+ cls_driver:
+ drv = NULL;
+- printk(KERN_ERR "Class suspend failed for %s\n",
+- kobject_name(&sysdev->kobj));
++ printk(KERN_ERR "Class suspend failed for %s: %d\n",
++ kobject_name(&sysdev->kobj), ret);
+
+ aux_driver:
+ if (drv)
+- printk(KERN_ERR "Class driver suspend failed for %s\n",
+- kobject_name(&sysdev->kobj));
++ printk(KERN_ERR "Class driver suspend failed for %s: %d\n",
++ kobject_name(&sysdev->kobj), ret);
+ list_for_each_entry(err_drv, &cls->drivers, entry) {
+ if (err_drv == drv)
+ break;
diff --git a/series b/series
index d31c3859255e3c..4da6046ac378f1 100644
--- a/series
+++ b/series
@@ -65,6 +65,7 @@ driver-core/hpilo-despecificate-driver-from-ilo-generation.patch
driver-core/driver-core-move-find_memory_block-routine.patch
driver-core/driver-core-add-mutex-for-adding-removing-memory-blocks.patch
driver-core/driver-core-add-section-count-to-memory_block-struct.patch
+driver-core/driver-core-display-error-codes-when-class-suspend-fails.patch
#####################################
# TTY patches for after 2.6.36 is out
@@ -258,8 +259,12 @@ usb/usb-musb-add-musb-support-for-am35x.patch
usb/usb-musb-am35x-workaround-for-fifo-read-issue.patch
usb/usb-ftdi_sio-add-device-ids-for-sciencescope.patch
usb/mxc_udc-add-workaround-for-engcm09152-for-i.mx35.patch
+usb/usb-r8a66597-udc-add-processing-when-usb-was-removed.patch
+usb/usb-gadget-fix-kconfig-warning.patch
+usb/usb-imx21-hcd-fix-off-by-one-resource-size-calculation.patch
# staging stuff for next is now in the staging-next tree on git.kernel.org
+
diff --git a/usb/usb-gadget-fix-kconfig-warning.patch b/usb/usb-gadget-fix-kconfig-warning.patch
new file mode 100644
index 00000000000000..65e1b4c803e734
--- /dev/null
+++ b/usb/usb-gadget-fix-kconfig-warning.patch
@@ -0,0 +1,47 @@
+From felipe.contreras@gmail.com Wed Oct 20 14:25:25 2010
+From: Felipe Contreras <felipe.contreras@gmail.com>
+Cc: Greg KH <greg@kroah.com>,
+ Felipe Balbi <balbi@ti.com>,
+ Tony Lindgren <tony@atomide.com>,
+ Felipe Contreras <felipe.contreras@gmail.com>
+Subject: usb: gadget: fix Kconfig warning
+Date: Tue, 19 Oct 2010 13:03:26 +0300
+Message-Id: <1287482608-11320-2-git-send-email-felipe.contreras@gmail.com>
+
+warning: (USB_MUSB_HDRC_HCD && USB_SUPPORT && USB_MUSB_HDRC &&
+(USB_MUSB_HOST || USB_MUSB_OTG) && USB_GADGET_MUSB_HDRC || USB_MUSB_OTG
+&& <choice> && USB && USB_GADGET && PM && EXPERIMENTAL) selects USB_OTG
+which has unmet direct dependencies (USB_GADGET_OMAP && ARCH_OMAP_OTG &&
+USB_OHCI_HCD)
+
+This doesn't seem to happen on 2.6.36-rc8, but still doesn't make sense
+to keep this duplicated config that is already defined in usb/core.
+
+Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
+Acked-by: Felipe Balbi <balbi@ti.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/gadget/Kconfig | 11 -----------
+ 1 file changed, 11 deletions(-)
+
+--- a/drivers/usb/gadget/Kconfig
++++ b/drivers/usb/gadget/Kconfig
+@@ -210,17 +210,6 @@ config USB_OMAP
+ default USB_GADGET
+ select USB_GADGET_SELECTED
+
+-config USB_OTG
+- boolean "OTG Support"
+- depends on USB_GADGET_OMAP && ARCH_OMAP_OTG && USB_OHCI_HCD
+- help
+- The most notable feature of USB OTG is support for a
+- "Dual-Role" device, which can act as either a device
+- or a host. The initial role choice can be changed
+- later, when two dual-role devices talk to each other.
+-
+- Select this only if your OMAP board has a Mini-AB connector.
+-
+ config USB_GADGET_PXA25X
+ boolean "PXA 25x or IXP 4xx"
+ depends on (ARCH_PXA && PXA25x) || ARCH_IXP4XX
diff --git a/usb/usb-imx21-hcd-fix-off-by-one-resource-size-calculation.patch b/usb/usb-imx21-hcd-fix-off-by-one-resource-size-calculation.patch
new file mode 100644
index 00000000000000..6f30326f265fd3
--- /dev/null
+++ b/usb/usb-imx21-hcd-fix-off-by-one-resource-size-calculation.patch
@@ -0,0 +1,26 @@
+From axel.lin@gmail.com Wed Oct 20 14:26:37 2010
+Subject: USB: imx21-hcd - fix off by one resource size calculation
+From: Axel Lin <axel.lin@gmail.com>
+Cc: Greg Kroah-Hartman <gregkh@suse.de>,
+ Martin Fuzzey <mfuzzey@gmail.com>, linux-usb@vger.kernel.org
+Date: Sat, 16 Oct 2010 22:48:08 +0800
+Message-ID: <1287240488.2831.1.camel@phoenix>
+
+Signed-off-by: Axel Lin <axel.lin@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/host/imx21-hcd.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/usb/host/imx21-hcd.c
++++ b/drivers/usb/host/imx21-hcd.c
+@@ -1906,7 +1906,7 @@ failed_clock_set:
+ failed_clock_get:
+ iounmap(imx21->regs);
+ failed_ioremap:
+- release_mem_region(res->start, res->end - res->start);
++ release_mem_region(res->start, resource_size(res));
+ failed_request_mem:
+ remove_debug_files(imx21);
+ usb_put_hcd(hcd);
diff --git a/usb/usb-r8a66597-udc-add-processing-when-usb-was-removed.patch b/usb/usb-r8a66597-udc-add-processing-when-usb-was-removed.patch
new file mode 100644
index 00000000000000..ced13c253379f1
--- /dev/null
+++ b/usb/usb-r8a66597-udc-add-processing-when-usb-was-removed.patch
@@ -0,0 +1,40 @@
+From yusuke.goda.sx@renesas.com Wed Oct 20 14:24:29 2010
+Date: Wed, 20 Oct 2010 09:28:08 +0900
+From: Yusuke Goda <yusuke.goda.sx@renesas.com>
+Subject: usb: r8a66597-udc: Add processing when USB was removed.
+To: linux-usb@vger.kernel.org
+Cc: dbrownell@users.sourceforge.net, gregkh@suse.de,
+ Paul Mundt <lethal@linux-sh.org>,
+ Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
+Message-id: <4CBE3798.2080009@renesas.com>
+
+When USB was removed, this patch prepares for the next insertion.
+
+Signed-off-by: Yusuke Goda <yusuke.goda.sx@renesas.com>
+Acked-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
+Cc: Paul Mundt <lethal@linux-sh.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/gadget/r8a66597-udc.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/drivers/usb/gadget/r8a66597-udc.c
++++ b/drivers/usb/gadget/r8a66597-udc.c
+@@ -42,6 +42,7 @@ static const char *r8a66597_ep_name[] =
+ "ep8", "ep9",
+ };
+
++static void init_controller(struct r8a66597 *r8a66597);
+ static void disable_controller(struct r8a66597 *r8a66597);
+ static void irq_ep0_write(struct r8a66597_ep *ep, struct r8a66597_request *req);
+ static void irq_packet_write(struct r8a66597_ep *ep,
+@@ -104,6 +105,8 @@ __acquires(r8a66597->lock)
+ spin_lock(&r8a66597->lock);
+
+ disable_controller(r8a66597);
++ init_controller(r8a66597);
++ r8a66597_bset(r8a66597, VBSE, INTENB0);
+ INIT_LIST_HEAD(&r8a66597->ep[0].queue);
+ }
+
generated by cgit 1.2.3-korg (git 2.43.0) at 2026-03-01 15:49:31 +0000