From: Greg Kroah-Hartman Date: Sun, 28 Oct 2012 18:08:30 +0000 (-0700) Subject: refresh patches X-Git-Tag: v3.0.50~18 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e92853cf97d4817769b3a78271e5d27fd379c3be;p=thirdparty%2Fkernel%2Fstable-queue.git refresh patches --- diff --git a/queue-3.6/usb-option-fix-interface-data-memory-leak-in-error-path.patch b/queue-3.6/usb-option-fix-interface-data-memory-leak-in-error-path.patch index 9b947776ca9..7d1305a3327 100644 --- a/queue-3.6/usb-option-fix-interface-data-memory-leak-in-error-path.patch +++ b/queue-3.6/usb-option-fix-interface-data-memory-leak-in-error-path.patch @@ -30,7 +30,7 @@ Signed-off-by: Greg Kroah-Hartman static void option_release(struct usb_serial *serial); static int option_send_setup(struct usb_serial_port *port); static void option_instat_callback(struct urb *urb); -@@ -1244,6 +1245,7 @@ static struct usb_serial_driver option_1 +@@ -1288,6 +1289,7 @@ static struct usb_serial_driver option_1 .tiocmget = usb_wwan_tiocmget, .tiocmset = usb_wwan_tiocmset, .ioctl = usb_wwan_ioctl, @@ -38,7 +38,7 @@ Signed-off-by: Greg Kroah-Hartman .release = option_release, .port_probe = usb_wwan_port_probe, .port_remove = usb_wwan_port_remove, -@@ -1293,8 +1295,6 @@ static bool is_blacklisted(const u8 ifnu +@@ -1337,8 +1339,6 @@ static bool is_blacklisted(const u8 ifnu static int option_probe(struct usb_serial *serial, const struct usb_device_id *id) { @@ -47,7 +47,7 @@ Signed-off-by: Greg Kroah-Hartman struct usb_interface_descriptor *iface_desc = &serial->interface->cur_altsetting->desc; struct usb_device_descriptor *dev_desc = &serial->dev->descriptor; -@@ -1332,6 +1332,19 @@ static int option_probe(struct usb_seria +@@ -1376,6 +1376,19 @@ static int option_probe(struct usb_seria iface_desc->bInterfaceClass != USB_CLASS_CDC_DATA) return -ENODEV; @@ -67,7 +67,7 @@ Signed-off-by: Greg Kroah-Hartman data = kzalloc(sizeof(struct usb_wwan_intf_private), GFP_KERNEL); if (!data) return -ENOMEM; -@@ -1342,6 +1355,10 @@ static int option_probe(struct usb_seria +@@ -1386,6 +1399,10 @@ static int option_probe(struct usb_seria return -ENOMEM; } diff --git a/queue-3.6/usb-usb-wwan-fix-multiple-memory-leaks-in-error-paths.patch b/queue-3.6/usb-usb-wwan-fix-multiple-memory-leaks-in-error-paths.patch index 6b67f3e48b1..c450f0eac17 100644 --- a/queue-3.6/usb-usb-wwan-fix-multiple-memory-leaks-in-error-paths.patch +++ b/queue-3.6/usb-usb-wwan-fix-multiple-memory-leaks-in-error-paths.patch @@ -47,7 +47,7 @@ Signed-off-by: Greg Kroah-Hartman .write = usb_wwan_write, --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c -@@ -1244,8 +1244,8 @@ static struct usb_serial_driver option_1 +@@ -1288,8 +1288,8 @@ static struct usb_serial_driver option_1 .tiocmget = usb_wwan_tiocmget, .tiocmset = usb_wwan_tiocmset, .ioctl = usb_wwan_ioctl, diff --git a/queue-3.6/xhci-endianness-xhci_calculate_intel_u2_timeout.patch b/queue-3.6/xhci-endianness-xhci_calculate_intel_u2_timeout.patch index 92fd86ae967..40ad6a93ca5 100644 --- a/queue-3.6/xhci-endianness-xhci_calculate_intel_u2_timeout.patch +++ b/queue-3.6/xhci-endianness-xhci_calculate_intel_u2_timeout.patch @@ -23,7 +23,7 @@ Signed-off-by: Greg Kroah-Hartman --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c -@@ -4140,7 +4140,7 @@ static u16 xhci_calculate_intel_u2_timeo +@@ -4141,7 +4141,7 @@ static u16 xhci_calculate_intel_u2_timeo (xhci_service_interval_to_ns(desc) > timeout_ns)) timeout_ns = xhci_service_interval_to_ns(desc); diff --git a/queue-3.6/xhci-fix-integer-overflow.patch b/queue-3.6/xhci-fix-integer-overflow.patch index 1d0bda5e6d4..d8757f5912a 100644 --- a/queue-3.6/xhci-fix-integer-overflow.patch +++ b/queue-3.6/xhci-fix-integer-overflow.patch @@ -25,7 +25,7 @@ Signed-off-by: Greg Kroah-Hartman --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c -@@ -4019,7 +4019,7 @@ int xhci_update_device(struct usb_hcd *h +@@ -4020,7 +4020,7 @@ int xhci_update_device(struct usb_hcd *h static unsigned long long xhci_service_interval_to_ns( struct usb_endpoint_descriptor *desc) {