From: Greg Kroah-Hartman Date: Tue, 3 Jun 2014 21:10:37 +0000 (-0700) Subject: 3.4-stable patches X-Git-Tag: v3.14.6~69 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=47c4b9a1d6558579508b179a385b76c4543572ff;p=thirdparty%2Fkernel%2Fstable-queue.git 3.4-stable patches added patches: rt2x00-fix-beaconing-on-usb.patch usb-gadget-at91-udc-fix-irq-and-iomem-resource-retrieval.patch usb-nokia-305-should-be-treated-as-unusual-dev.patch usb-nokia-5300-should-be-treated-as-unusual-dev.patch usb-storage-shuttle_usbat-fix-discs-being-detected-twice.patch --- diff --git a/queue-3.4/rt2x00-fix-beaconing-on-usb.patch b/queue-3.4/rt2x00-fix-beaconing-on-usb.patch new file mode 100644 index 00000000000..9cd39f04dec --- /dev/null +++ b/queue-3.4/rt2x00-fix-beaconing-on-usb.patch @@ -0,0 +1,67 @@ +From 8834d3608cc516f13e2e510f4057c263f3d2ce42 Mon Sep 17 00:00:00 2001 +From: Stanislaw Gruszka +Date: Thu, 17 Apr 2014 11:08:47 +0200 +Subject: rt2x00: fix beaconing on USB + +From: Stanislaw Gruszka + +commit 8834d3608cc516f13e2e510f4057c263f3d2ce42 upstream. + +When disable beaconing we clear register with beacon and newer set it +back, what make we stop send beacons infinitely. + +Signed-off-by: Stanislaw Gruszka +Signed-off-by: John W. Linville +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/net/wireless/rt2x00/rt2x00mac.c | 22 ++++++++++++---------- + 1 file changed, 12 insertions(+), 10 deletions(-) + +--- a/drivers/net/wireless/rt2x00/rt2x00mac.c ++++ b/drivers/net/wireless/rt2x00/rt2x00mac.c +@@ -651,20 +651,18 @@ void rt2x00mac_bss_info_changed(struct i + bss_conf->bssid); + + /* +- * Update the beacon. This is only required on USB devices. PCI +- * devices fetch beacons periodically. +- */ +- if (changes & BSS_CHANGED_BEACON && rt2x00_is_usb(rt2x00dev)) +- rt2x00queue_update_beacon(rt2x00dev, vif); +- +- /* + * Start/stop beaconing. + */ + if (changes & BSS_CHANGED_BEACON_ENABLED) { + if (!bss_conf->enable_beacon && intf->enable_beacon) { +- rt2x00queue_clear_beacon(rt2x00dev, vif); + rt2x00dev->intf_beaconing--; + intf->enable_beacon = false; ++ /* ++ * Clear beacon in the H/W for this vif. This is needed ++ * to disable beaconing on this particular interface ++ * and keep it running on other interfaces. ++ */ ++ rt2x00queue_clear_beacon(rt2x00dev, vif); + + if (rt2x00dev->intf_beaconing == 0) { + /* +@@ -675,11 +673,15 @@ void rt2x00mac_bss_info_changed(struct i + rt2x00queue_stop_queue(rt2x00dev->bcn); + mutex_unlock(&intf->beacon_skb_mutex); + } +- +- + } else if (bss_conf->enable_beacon && !intf->enable_beacon) { + rt2x00dev->intf_beaconing++; + intf->enable_beacon = true; ++ /* ++ * Upload beacon to the H/W. This is only required on ++ * USB devices. PCI devices fetch beacons periodically. ++ */ ++ if (rt2x00_is_usb(rt2x00dev)) ++ rt2x00queue_update_beacon(rt2x00dev, vif); + + if (rt2x00dev->intf_beaconing == 1) { + /* diff --git a/queue-3.4/series b/queue-3.4/series index 59989d05f8a..10eafd16c43 100644 --- a/queue-3.4/series +++ b/queue-3.4/series @@ -49,3 +49,8 @@ hrtimer-prevent-remote-enqueue-of-leftmost-timers.patch hrtimer-set-expiry-time-before-switch_hrtimer_base.patch md-avoid-possible-spinning-md-thread-at-shutdown.patch drm-radeon-fix-atpx-detection-on-non-vga-gpus.patch +usb-gadget-at91-udc-fix-irq-and-iomem-resource-retrieval.patch +usb-storage-shuttle_usbat-fix-discs-being-detected-twice.patch +usb-nokia-305-should-be-treated-as-unusual-dev.patch +usb-nokia-5300-should-be-treated-as-unusual-dev.patch +rt2x00-fix-beaconing-on-usb.patch diff --git a/queue-3.4/usb-gadget-at91-udc-fix-irq-and-iomem-resource-retrieval.patch b/queue-3.4/usb-gadget-at91-udc-fix-irq-and-iomem-resource-retrieval.patch new file mode 100644 index 00000000000..2d2da45d546 --- /dev/null +++ b/queue-3.4/usb-gadget-at91-udc-fix-irq-and-iomem-resource-retrieval.patch @@ -0,0 +1,42 @@ +From 886c7c426d465732ec9d1b2bbdda5642fc2e7e05 Mon Sep 17 00:00:00 2001 +From: Jean-Jacques Hiblot +Date: Wed, 12 Mar 2014 17:30:08 +0100 +Subject: usb: gadget: at91-udc: fix irq and iomem resource retrieval + +From: Jean-Jacques Hiblot + +commit 886c7c426d465732ec9d1b2bbdda5642fc2e7e05 upstream. + +When using dt resources retrieval (interrupts and reg properties) there is +no predefined order for these resources in the platform dev resource +table. Also don't expect the number of resource to be always 2. + +Signed-off-by: Jean-Jacques Hiblot +Acked-by: Boris BREZILLON +Acked-by: Nicolas Ferre +Signed-off-by: Felipe Balbi +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/gadget/at91_udc.c | 10 ---------- + 1 file changed, 10 deletions(-) + +--- a/drivers/usb/gadget/at91_udc.c ++++ b/drivers/usb/gadget/at91_udc.c +@@ -1741,16 +1741,6 @@ static int __devinit at91udc_probe(struc + return -ENODEV; + } + +- if (pdev->num_resources != 2) { +- DBG("invalid num_resources\n"); +- return -ENODEV; +- } +- if ((pdev->resource[0].flags != IORESOURCE_MEM) +- || (pdev->resource[1].flags != IORESOURCE_IRQ)) { +- DBG("invalid resource type\n"); +- return -ENODEV; +- } +- + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (!res) + return -ENXIO; diff --git a/queue-3.4/usb-nokia-305-should-be-treated-as-unusual-dev.patch b/queue-3.4/usb-nokia-305-should-be-treated-as-unusual-dev.patch new file mode 100644 index 00000000000..8f4e5ddbc89 --- /dev/null +++ b/queue-3.4/usb-nokia-305-should-be-treated-as-unusual-dev.patch @@ -0,0 +1,32 @@ +From f0ef5d41792a46a1085dead9dfb0bdb2c574638e Mon Sep 17 00:00:00 2001 +From: "Victor A. Santos" +Date: Sat, 26 Apr 2014 23:20:14 -0300 +Subject: USB: Nokia 305 should be treated as unusual dev + +From: "Victor A. Santos" + +commit f0ef5d41792a46a1085dead9dfb0bdb2c574638e upstream. + +Signed-off-by: Victor A. Santos +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/storage/unusual_devs.h | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/drivers/usb/storage/unusual_devs.h ++++ b/drivers/usb/storage/unusual_devs.h +@@ -226,6 +226,13 @@ UNUSUAL_DEV( 0x0421, 0x0495, 0x0370, 0x + USB_SC_DEVICE, USB_PR_DEVICE, NULL, + US_FL_MAX_SECTORS_64 ), + ++/* Patch submitted by Victor A. Santos */ ++UNUSUAL_DEV( 0x0421, 0x05af, 0x0742, 0x0742, ++ "Nokia", ++ "305", ++ USB_SC_DEVICE, USB_PR_DEVICE, NULL, ++ US_FL_MAX_SECTORS_64), ++ + /* Patch submitted by Mikhail Zolotaryov */ + UNUSUAL_DEV( 0x0421, 0x06aa, 0x1110, 0x1110, + "Nokia", diff --git a/queue-3.4/usb-nokia-5300-should-be-treated-as-unusual-dev.patch b/queue-3.4/usb-nokia-5300-should-be-treated-as-unusual-dev.patch new file mode 100644 index 00000000000..355b8e97cd5 --- /dev/null +++ b/queue-3.4/usb-nokia-5300-should-be-treated-as-unusual-dev.patch @@ -0,0 +1,32 @@ +From 6ed07d45d09bc2aa60e27b845543db9972e22a38 Mon Sep 17 00:00:00 2001 +From: Daniele Forsi +Date: Mon, 28 Apr 2014 17:09:11 +0200 +Subject: USB: Nokia 5300 should be treated as unusual dev + +From: Daniele Forsi + +commit 6ed07d45d09bc2aa60e27b845543db9972e22a38 upstream. + +Signed-off-by: Daniele Forsi +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/storage/unusual_devs.h | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/drivers/usb/storage/unusual_devs.h ++++ b/drivers/usb/storage/unusual_devs.h +@@ -226,6 +226,13 @@ UNUSUAL_DEV( 0x0421, 0x0495, 0x0370, 0x + USB_SC_DEVICE, USB_PR_DEVICE, NULL, + US_FL_MAX_SECTORS_64 ), + ++/* Reported by Daniele Forsi */ ++UNUSUAL_DEV( 0x0421, 0x04b9, 0x0350, 0x0350, ++ "Nokia", ++ "5300", ++ USB_SC_DEVICE, USB_PR_DEVICE, NULL, ++ US_FL_MAX_SECTORS_64 ), ++ + /* Patch submitted by Victor A. Santos */ + UNUSUAL_DEV( 0x0421, 0x05af, 0x0742, 0x0742, + "Nokia", diff --git a/queue-3.4/usb-storage-shuttle_usbat-fix-discs-being-detected-twice.patch b/queue-3.4/usb-storage-shuttle_usbat-fix-discs-being-detected-twice.patch new file mode 100644 index 00000000000..a11656018c0 --- /dev/null +++ b/queue-3.4/usb-storage-shuttle_usbat-fix-discs-being-detected-twice.patch @@ -0,0 +1,32 @@ +From df602c2d2358f02c6e49cffc5b49b9daa16db033 Mon Sep 17 00:00:00 2001 +From: Daniele Forsi +Date: Tue, 29 Apr 2014 11:44:03 +0200 +Subject: usb: storage: shuttle_usbat: fix discs being detected twice + +From: Daniele Forsi + +commit df602c2d2358f02c6e49cffc5b49b9daa16db033 upstream. + +Even if the USB-to-ATAPI converter supported multiple LUNs, this +driver would always detect the same physical device or media because +it doesn't use srb->device->lun in any way. +Tested with an Hewlett-Packard CD-Writer Plus 8200e. + +Signed-off-by: Daniele Forsi +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/storage/shuttle_usbat.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/usb/storage/shuttle_usbat.c ++++ b/drivers/usb/storage/shuttle_usbat.c +@@ -1846,7 +1846,7 @@ static int usbat_probe(struct usb_interf + us->transport_name = "Shuttle USBAT"; + us->transport = usbat_flash_transport; + us->transport_reset = usb_stor_CB_reset; +- us->max_lun = 1; ++ us->max_lun = 0; + + result = usb_stor_probe2(us); + return result;