From: Greg Kroah-Hartman Date: Wed, 27 Feb 2013 17:38:37 +0000 (-0800) Subject: removed queue-3.4/usb-ehci-omap-don-t-free-gpios-that-we-didn-t-request.patch X-Git-Tag: v3.8.1~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9a6c5d1bc7c30f1054f3e6dd5c83bb7c0ee7a985;p=thirdparty%2Fkernel%2Fstable-queue.git removed queue-3.4/usb-ehci-omap-don-t-free-gpios-that-we-didn-t-request.patch --- diff --git a/queue-3.4/series b/queue-3.4/series index 95ec735d7a6..d85223fb85e 100644 --- a/queue-3.4/series +++ b/queue-3.4/series @@ -76,7 +76,6 @@ ipv4-fix-a-bug-in-ping_err.patch ipv6-use-a-stronger-hash-for-tcp.patch sock_diag-fix-out-of-bounds-access-to-sock_diag_handlers.patch vlan-adjust-vlan_set_encap_proto-for-its-callers.patch -usb-ehci-omap-don-t-free-gpios-that-we-didn-t-request.patch dca-check-against-empty-dca_domains-list-before-unregister-provider.patch usb-option-add-and-update-alcatel-modems.patch usb-option-add-yota-megafon-m100-1-4g-modem.patch diff --git a/queue-3.4/usb-ehci-omap-don-t-free-gpios-that-we-didn-t-request.patch b/queue-3.4/usb-ehci-omap-don-t-free-gpios-that-we-didn-t-request.patch deleted file mode 100644 index b4622af9456..00000000000 --- a/queue-3.4/usb-ehci-omap-don-t-free-gpios-that-we-didn-t-request.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 428525f97153505e83983460a8d08a3210aa6b8a Mon Sep 17 00:00:00 2001 -From: Roger Quadros -Date: Thu, 14 Feb 2013 17:08:08 +0200 -Subject: USB: ehci-omap: Don't free gpios that we didn't request - -From: Roger Quadros - -commit 428525f97153505e83983460a8d08a3210aa6b8a upstream. - -This driver does not request any gpios so don't free them. -Fixes L3 bus error on multiple modprobe/rmmod of ehci_hcd -with ehci-omap in use. - -Without this patch, EHCI will break on repeated insmod/rmmod -of ehci_hcd for all OMAP2+ platforms that use EHCI and -set 'phy_reset = true' in usbhs_omap_board_data. -i.e. - -board-3430sdp.c: .phy_reset = true, -board-3630sdp.c: .phy_reset = true, -board-am3517crane.c: .phy_reset = true, -board-am3517evm.c: .phy_reset = true, -board-cm-t3517.c: .phy_reset = true, -board-cm-t35.c: .phy_reset = true, -board-devkit8000.c: .phy_reset = true, -board-igep0020.c: .phy_reset = true, -board-igep0020.c: .phy_reset = true, -board-omap3beagle.c: .phy_reset = true, -board-omap3evm.c: .phy_reset = true, -board-omap3pandora.c: .phy_reset = true, -board-omap3stalker.c: .phy_reset = true, -board-omap3touchbook.c: .phy_reset = true, -board-omap4panda.c: .phy_reset = false, -board-overo.c: .phy_reset = true, -board-zoom.c: .phy_reset = true, - -Signed-off-by: Roger Quadros -Reviewed-by: Felipe Balbi -Acked-by: Alan Stern -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/usb/host/ehci-omap.c | 8 -------- - 1 file changed, 8 deletions(-) - ---- a/drivers/usb/host/ehci-omap.c -+++ b/drivers/usb/host/ehci-omap.c -@@ -288,7 +288,6 @@ static int ehci_hcd_omap_remove(struct p - { - struct device *dev = &pdev->dev; - struct usb_hcd *hcd = dev_get_drvdata(dev); -- struct ehci_hcd_omap_platform_data *pdata = dev->platform_data; - - usb_remove_hcd(hcd); - disable_put_regulator(dev->platform_data); -@@ -297,13 +296,6 @@ static int ehci_hcd_omap_remove(struct p - pm_runtime_put_sync(dev); - pm_runtime_disable(dev); - -- if (pdata->phy_reset) { -- if (gpio_is_valid(pdata->reset_gpio_port[0])) -- gpio_free(pdata->reset_gpio_port[0]); -- -- if (gpio_is_valid(pdata->reset_gpio_port[1])) -- gpio_free(pdata->reset_gpio_port[1]); -- } - return 0; - } - diff --git a/queue-3.4/usb-ehci-omap-fix-autoloading-of-module.patch b/queue-3.4/usb-ehci-omap-fix-autoloading-of-module.patch index 8759d703a97..946ac373f89 100644 --- a/queue-3.4/usb-ehci-omap-fix-autoloading-of-module.patch +++ b/queue-3.4/usb-ehci-omap-fix-autoloading-of-module.patch @@ -21,7 +21,7 @@ Signed-off-by: Greg Kroah-Hartman --- a/drivers/usb/host/ehci-omap.c +++ b/drivers/usb/host/ehci-omap.c -@@ -363,7 +363,7 @@ static const struct hc_driver ehci_omap_ +@@ -371,7 +371,7 @@ static const struct hc_driver ehci_omap_ .clear_tt_buffer_complete = ehci_clear_tt_buffer_complete, };