diff options
13 files changed, 394 insertions, 6 deletions
diff --git a/driver-core/dcdbas-remove-a-redundant-smi_data_buf_free-in-dcdbas_exit.patch b/driver-core/dcdbas-remove-a-redundant-smi_data_buf_free-in-dcdbas_exit.patch new file mode 100644 index 00000000000000..8feae2dbdff513 --- /dev/null +++ b/driver-core/dcdbas-remove-a-redundant-smi_data_buf_free-in-dcdbas_exit.patch @@ -0,0 +1,42 @@ +From axel.lin@gmail.com Thu Jul 8 08:58:41 2010 +From: Axel Lin <axel.lin@gmail.com> +Date: Mon, 05 Jul 2010 09:35:47 +0800 +Subject: dcdbas: remove a redundant smi_data_buf_free in dcdbas_exit +Cc: Doug Warzecha <Douglas_Warzecha@dell.com>, Chris Wright <chrisw@sous-sol.org>, Tejun Heo <tj@kernel.org>, Greg Kroah-Hartman <gregkh@suse.de> +Message-ID: <1278293747.12801.7.camel@mola> + + +From: Axel Lin <axel.lin@gmail.com> + +smi_data_buf_free is called twice in current implementation. +The second call simply return because smi_data_buf is set to NULL in first call. +This patch removes the second smi_data_buf_free call. + +Signed-off-by: Axel Lin <axel.lin@gmail.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/firmware/dcdbas.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +--- a/drivers/firmware/dcdbas.c ++++ b/drivers/firmware/dcdbas.c +@@ -634,9 +634,6 @@ static void __exit dcdbas_exit(void) + * before platform_device_unregister + */ + unregister_reboot_notifier(&dcdbas_reboot_nb); +- smi_data_buf_free(); +- platform_device_unregister(dcdbas_pdev); +- platform_driver_unregister(&dcdbas_driver); + + /* + * We have to free the buffer here instead of dcdbas_remove +@@ -645,6 +642,8 @@ static void __exit dcdbas_exit(void) + * released. + */ + smi_data_buf_free(); ++ platform_device_unregister(dcdbas_pdev); ++ platform_driver_unregister(&dcdbas_driver); + } + + module_init(dcdbas_init); diff --git a/driver-core/dmi-id-fix-a-memory-leak-in-dmi_id_init-error-path.patch b/driver-core/dmi-id-fix-a-memory-leak-in-dmi_id_init-error-path.patch new file mode 100644 index 00000000000000..bb465efabab293 --- /dev/null +++ b/driver-core/dmi-id-fix-a-memory-leak-in-dmi_id_init-error-path.patch @@ -0,0 +1,35 @@ +From axel.lin@gmail.com Thu Jul 8 08:56:03 2010 +From: Axel Lin <axel.lin@gmail.com> +Date: Thu, 01 Jul 2010 10:35:07 +0800 +Subject: dmi-id: fix a memory leak in dmi_id_init error path +To: linux-kernel <linux-kernel@vger.kernel.org> +Cc: Tejun Heo <tj@kernel.org>, David Brownell <dbrownell@users.sourceforge.net>, Greg Kroah-Hartman <gregkh@suse.de> +Message-ID: <1277951707.30073.5.camel@mola> + + +This patch adds a missing kfree(dmi_dev) in dmi_id_init error path. + +Signed-off-by: Axel Lin <axel.lin@gmail.com> +Acked-by: Tejun Heo <tj@kernel.org> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/firmware/dmi-id.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +--- a/drivers/firmware/dmi-id.c ++++ b/drivers/firmware/dmi-id.c +@@ -229,10 +229,12 @@ static int __init dmi_id_init(void) + + ret = device_register(dmi_dev); + if (ret) +- goto fail_class_unregister; ++ goto fail_free_dmi_dev; + + return 0; + ++fail_free_dmi_dev: ++ kfree(dmi_dev); + fail_class_unregister: + + class_unregister(&dmi_class); @@ -12,10 +12,17 @@ gregkh/gkh-version.patch ################################# # TTY patches for 2.6.35 ################################# +tty.current/serial-fix-rs485-for-atmel_serial-on-avr32.patch ################################# # USB patches for 2.6.35 ################################# +usb.current/usb-option-add-support-for-1da5-4518.patch +usb.current/usb-add-pid-for-sierra-250u-to-drivers-usb-serial-sierra.c.patch +usb.current/usb-expose-vendor-specific-acm-channel-on-nokia-5230.patch +usb.current/usb-s3c2410_udc-be-aware-of-connected-gadget-driver.patch +usb.current/usb-ftdi_sio-support-for-signalyzer-tools-based-on-ftdi-chips.patch +usb.current/usb-new-pids-for-qualcomm-gobi-2000-qcserial.patch ################################# # Staging patches for 2.6.35 @@ -41,6 +48,8 @@ driver-core/driver-core-reduce-duplicated-code-for-platform_device-creation.patc driver-core/driver-core-move-platform-device-creation-helpers-to-.init.text-if-module-n.patch driver-core/firmware-update-hotplug-script-remove-sysfs-files.patch driver-core/sysfs-sysfs_chmod_file-s-attr-can-be-const.patch +driver-core/dmi-id-fix-a-memory-leak-in-dmi_id_init-error-path.patch +driver-core/dcdbas-remove-a-redundant-smi_data_buf_free-in-dcdbas_exit.patch ##################################### # TTY patches for after 2.6.35 is out @@ -165,4 +174,3 @@ usb/usb-musb-tusb6010-fix-compile-error-with-n8x0_defconfig.patch # staging stuff is now in the staging-next tree on git.kernel.org - diff --git a/tty.current/serial-fix-rs485-for-atmel_serial-on-avr32.patch b/tty.current/serial-fix-rs485-for-atmel_serial-on-avr32.patch new file mode 100644 index 00000000000000..aacfa198cf812f --- /dev/null +++ b/tty.current/serial-fix-rs485-for-atmel_serial-on-avr32.patch @@ -0,0 +1,72 @@ +From PeterHuewe@gmx.de Thu Jul 8 08:54:58 2010 +From: Peter H�we <PeterHuewe@gmx.de> +Date: Tue, 29 Jun 2010 19:35:39 +0200 +Subject: serial: fix rs485 for atmel_serial on avr32 +To: Haavard Skinnemoen <hskinnemoen@atmel.com>, Claudio Scordino <claudio@evidence.eu.com> +Cc: "Greg Kroah-Hartman" <gregkh@suse.de>, Howard Chu <hyc@symas.com>, Peter Ma <pma@mediamatech.com>, Andrew Morton <akpm@linux-foundation.org>, Albin Tonnerre <albin.tonnerre@free-electrons.com>, Alan Cox <alan@linux.intel.com>, Stephen Rothwell <sfr@canb.auug.org.au>, Sebastian Heutling <Sebastian.Heutling@who-ing.de>, Bernhard Roth <br@pwrnet.de>, Ryan Mallon <ryan@bluewatersys.com>, Michael Trimarchi <michael@evidence.eu.com>, Rick Bronson <rick@efn.org>, Sebastian Heutling <Sebastian.Heutling@who-ing.de>, Russell King <rmk+kernel@arm.linux.org.uk>, kernel@avr32linux.org, linux-arm-kernel@lists.infradead.org +Message-ID: <201006291935.40229.PeterHuewe@gmx.de> + + +From: Peter Huewe <peterhuewe@gmx.de> + +This patch fixes a build failure [1-4] in the atmel_serial code introduced by +patch the patch ARM: 6092/1: atmel_serial: support for RS485 +communications (e8faff7330a3501eafc9bfe5f4f15af444be29f5) + +The build failure was caused by missing struct field and missing defines +for the avr32 board - the patch fixes this. + +[1] http://kisskb.ellerman.id.au/kisskb/buildresult/2575242/ - first failure in linux-next, may 11th +[2] http://kisskb.ellerman.id.au/kisskb/buildresult/2816418/ - still exists as of today +[3] http://kisskb.ellerman.id.au/kisskb/buildresult/2617511/ - first failure in Linus' tree - May 20th - did really no one notice this?! +[4] http://kisskb.ellerman.id.au/kisskb/buildresult/2813956/ - still exists in Linus' tree as of today + +Signed-off-by: Peter Huewe <peterhuewe@gmx.de> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + arch/avr32/include/asm/ioctls.h | 3 +++ + arch/avr32/mach-at32ap/include/mach/board.h | 2 ++ + drivers/serial/atmel_serial.c | 1 + + 3 files changed, 6 insertions(+) + +--- a/arch/avr32/include/asm/ioctls.h ++++ b/arch/avr32/include/asm/ioctls.h +@@ -54,6 +54,9 @@ + #define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */ + #define TIOCSPTLCK _IOW('T',0x31, int) /* Lock/unlock Pty */ + ++#define TIOCGRS485 0x542E ++#define TIOCSRS485 0x542F ++ + #define FIONCLEX 0x5450 + #define FIOCLEX 0x5451 + #define FIOASYNC 0x5452 +--- a/arch/avr32/mach-at32ap/include/mach/board.h ++++ b/arch/avr32/mach-at32ap/include/mach/board.h +@@ -5,6 +5,7 @@ + #define __ASM_ARCH_BOARD_H + + #include <linux/types.h> ++#include <linux/serial.h> + + #define GPIO_PIN_NONE (-1) + +@@ -35,6 +36,7 @@ struct atmel_uart_data { + short use_dma_tx; /* use transmit DMA? */ + short use_dma_rx; /* use receive DMA? */ + void __iomem *regs; /* virtual base address, if any */ ++ struct serial_rs485 rs485; /* rs485 settings */ + }; + void at32_map_usart(unsigned int hw_id, unsigned int line, int flags); + struct platform_device *at32_add_device_usart(unsigned int id); +--- a/drivers/serial/atmel_serial.c ++++ b/drivers/serial/atmel_serial.c +@@ -41,6 +41,7 @@ + #include <linux/uaccess.h> + + #include <asm/io.h> ++#include <asm/ioctls.h> + + #include <asm/mach/serial_at91.h> + #include <mach/board.h> diff --git a/tty/tty-add-extproc-support-for-linemode.patch b/tty/tty-add-extproc-support-for-linemode.patch index 2ef016ed23f7f3..5a63b09fe23c85 100644 --- a/tty/tty-add-extproc-support-for-linemode.patch +++ b/tty/tty-add-extproc-support-for-linemode.patch @@ -154,9 +154,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define TIOCSPTLCK _IOW('T',0x31, int) /* Lock/unlock Pty */ +#define TIOCSIG _IOW('T',0x36, int) /* Generate signal on Pty slave */ - #define FIONCLEX 0x5450 - #define FIOCLEX 0x5451 -@@ -79,6 +80,7 @@ + #define TIOCGRS485 0x542E + #define TIOCSRS485 0x542F +@@ -82,6 +83,7 @@ #define TIOCPKT_START 8 #define TIOCPKT_NOSTOP 16 #define TIOCPKT_DOSTOP 32 diff --git a/tty/tty-remove-remaining-hayes-esp-ioctls.patch b/tty/tty-remove-remaining-hayes-esp-ioctls.patch index f651916b0ca8a4..de396aa4bdfb98 100644 --- a/tty/tty-remove-remaining-hayes-esp-ioctls.patch +++ b/tty/tty-remove-remaining-hayes-esp-ioctls.patch @@ -39,7 +39,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #endif /* _ASM_ALPHA_IOCTLS_H */ --- a/arch/avr32/include/asm/ioctls.h +++ b/arch/avr32/include/asm/ioctls.h -@@ -69,8 +69,6 @@ +@@ -72,8 +72,6 @@ #define TIOCMIWAIT 0x545C /* wait for a change on serial input line(s) */ #define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */ diff --git a/usb.current/usb-add-pid-for-sierra-250u-to-drivers-usb-serial-sierra.c.patch b/usb.current/usb-add-pid-for-sierra-250u-to-drivers-usb-serial-sierra.c.patch new file mode 100644 index 00000000000000..48d85ec402d0f6 --- /dev/null +++ b/usb.current/usb-add-pid-for-sierra-250u-to-drivers-usb-serial-sierra.c.patch @@ -0,0 +1,30 @@ +From gus@pbx.org Thu Jul 8 08:51:10 2010 +From: august huber <gus@pbx.org> +Date: Mon, 28 Jun 2010 11:46:05 -0700 +Subject: USB: Add PID for Sierra 250U to drivers/usb/serial/sierra.c +To: gregkh@suse.de +Message-ID: <AANLkTilhVcuqVPUiPoBtuhEoFM4IgQq1HZpYqIndzOhT@mail.gmail.com> + + +Add VID/PID for Sierra Wireless 250U USB dongle to sierra.c +Allows use of 3G radio only + +Signed-off-by: August Huber <gus@pbx.org> +Cc: Elina Pasheva <epasheva@sierrawireless.com> +Cc: stable <stable@kernel.org> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/usb/serial/sierra.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/usb/serial/sierra.c ++++ b/drivers/usb/serial/sierra.c +@@ -245,6 +245,7 @@ static const struct usb_device_id id_tab + { USB_DEVICE(0x1199, 0x0021) }, /* Sierra Wireless AirCard 597E */ + { USB_DEVICE(0x1199, 0x0112) }, /* Sierra Wireless AirCard 580 */ + { USB_DEVICE(0x1199, 0x0120) }, /* Sierra Wireless USB Dongle 595U */ ++ { USB_DEVICE(0x1199, 0x0301) }, /* Sierra Wireless USB Dongle 250U */ + /* Sierra Wireless C597 */ + { USB_DEVICE_AND_INTERFACE_INFO(0x1199, 0x0023, 0xFF, 0xFF, 0xFF) }, + /* Sierra Wireless T598 */ diff --git a/usb.current/usb-expose-vendor-specific-acm-channel-on-nokia-5230.patch b/usb.current/usb-expose-vendor-specific-acm-channel-on-nokia-5230.patch new file mode 100644 index 00000000000000..f354607fb3ebcc --- /dev/null +++ b/usb.current/usb-expose-vendor-specific-acm-channel-on-nokia-5230.patch @@ -0,0 +1,31 @@ +From przemo@firszt.eu Thu Jul 8 08:53:20 2010 +From: Przemo Firszt <przemo@firszt.eu> +Date: Mon, 28 Jun 2010 21:29:34 +0100 +Subject: USB: Expose vendor-specific ACM channel on Nokia 5230 +To: oliver@neukum.name, gregkh@suse.de, alan@linux.intel.com, francescolavra@interfree.it, julian.calaby@gmail.com +Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Przemo Firszt <przemo@firszt.eu> +Message-ID: <1277756974-3373-1-git-send-email-przemo@firszt.eu> + + +Nokia S60 phones expose two ACM channels. The first is +a modem, the second is 'vendor-specific' but is treated +as a serial device at the S60 end, so we want to expose +it on Linux too. + +Signed-off-by: Przemo Firszt <przemo@firszt.eu> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/usb/class/cdc-acm.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/usb/class/cdc-acm.c ++++ b/drivers/usb/class/cdc-acm.c +@@ -1596,6 +1596,7 @@ static const struct usb_device_id acm_id + { NOKIA_PCSUITE_ACM_INFO(0x00e9), }, /* Nokia 5320 XpressMusic */ + { NOKIA_PCSUITE_ACM_INFO(0x0108), }, /* Nokia 5320 XpressMusic 2G */ + { NOKIA_PCSUITE_ACM_INFO(0x01f5), }, /* Nokia N97, RM-505 */ ++ { NOKIA_PCSUITE_ACM_INFO(0x02e3), }, /* Nokia 5230, RM-588 */ + + /* NOTE: non-Nokia COMM/ACM/0xff is likely MSFT RNDIS... NOT a modem! */ + diff --git a/usb.current/usb-ftdi_sio-support-for-signalyzer-tools-based-on-ftdi-chips.patch b/usb.current/usb-ftdi_sio-support-for-signalyzer-tools-based-on-ftdi-chips.patch new file mode 100644 index 00000000000000..9025548b2d3686 --- /dev/null +++ b/usb.current/usb-ftdi_sio-support-for-signalyzer-tools-based-on-ftdi-chips.patch @@ -0,0 +1,54 @@ +From colin.leitner@googlemail.com Thu Jul 8 08:56:30 2010 +From: Colin Leitner <colin.leitner@googlemail.com> +Date: Thu, 01 Jul 2010 10:49:55 +0200 +Subject: USB: ftdi_sio: support for Signalyzer tools based on FTDI chips +To: greg@kroah.com +Cc: jhovold@gmail.com +Message-ID: <1277974195.4483.2.camel@schleppi2> + + +ftdi_sio: support for Signalyzer tools based on FTDI chips + +This patch adds support for the Xverve Signalyzers. + +Signed-off-by: Colin Leitner <colin.leitner@googlemail.com> +Cc: stable <stable@kernel.org> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/usb/serial/ftdi_sio.c | 8 ++++++++ + drivers/usb/serial/ftdi_sio_ids.h | 9 +++++++++ + 2 files changed, 17 insertions(+) + +--- a/drivers/usb/serial/ftdi_sio.c ++++ b/drivers/usb/serial/ftdi_sio.c +@@ -737,6 +737,14 @@ static struct usb_device_id id_table_com + { USB_DEVICE(FTDI_VID, MJSG_SR_RADIO_PID) }, + { USB_DEVICE(FTDI_VID, MJSG_HD_RADIO_PID) }, + { USB_DEVICE(FTDI_VID, MJSG_XM_RADIO_PID) }, ++ { USB_DEVICE(FTDI_VID, XVERVE_SIGNALYZER_ST_PID), ++ .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, ++ { USB_DEVICE(FTDI_VID, XVERVE_SIGNALYZER_SLITE_PID), ++ .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, ++ { USB_DEVICE(FTDI_VID, XVERVE_SIGNALYZER_SH2_PID), ++ .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, ++ { USB_DEVICE(FTDI_VID, XVERVE_SIGNALYZER_SH4_PID), ++ .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, + { }, /* Optional parameter entry */ + { } /* Terminating entry */ + }; +--- a/drivers/usb/serial/ftdi_sio_ids.h ++++ b/drivers/usb/serial/ftdi_sio_ids.h +@@ -1017,3 +1017,12 @@ + #define MJSG_SR_RADIO_PID 0x9379 + #define MJSG_XM_RADIO_PID 0x937A + #define MJSG_HD_RADIO_PID 0x937C ++ ++/* ++ * Xverve Signalyzer tools (http://www.signalyzer.com/) ++ */ ++#define XVERVE_SIGNALYZER_ST_PID 0xBCA0 ++#define XVERVE_SIGNALYZER_SLITE_PID 0xBCA1 ++#define XVERVE_SIGNALYZER_SH2_PID 0xBCA2 ++#define XVERVE_SIGNALYZER_SH4_PID 0xBCA4 ++ diff --git a/usb.current/usb-new-pids-for-qualcomm-gobi-2000-qcserial.patch b/usb.current/usb-new-pids-for-qualcomm-gobi-2000-qcserial.patch new file mode 100644 index 00000000000000..492d7c96f9c99f --- /dev/null +++ b/usb.current/usb-new-pids-for-qualcomm-gobi-2000-qcserial.patch @@ -0,0 +1,28 @@ +From ajb@spheresystems.co.uk Thu Jul 8 08:57:02 2010 +From: Andrew Bird <ajb@spheresytems.co.uk> +Date: Thu, 1 Jul 2010 20:50:07 +0100 +Subject: USB: New PIDs for Qualcomm gobi 2000 (qcserial) +To: gregkh@suse.de +Message-ID: <201007012050.08881.ajb@spheresystems.co.uk> + + +Adds support for the Generic Qualcomm Gobi 2000 WWAN UMTS/CDMA modem + +Signed-off-by: Andrew Bird <ajb@spheresytems.co.uk> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/usb/serial/qcserial.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/drivers/usb/serial/qcserial.c ++++ b/drivers/usb/serial/qcserial.c +@@ -51,6 +51,8 @@ static const struct usb_device_id id_tab + {USB_DEVICE(0x1f45, 0x0001)}, /* Unknown Gobi QDL device */ + {USB_DEVICE(0x413c, 0x8185)}, /* Dell Gobi 2000 QDL device (N0218, VU936) */ + {USB_DEVICE(0x413c, 0x8186)}, /* Dell Gobi 2000 Modem device (N0218, VU936) */ ++ {USB_DEVICE(0x05c6, 0x9208)}, /* Generic Gobi 2000 QDL device */ ++ {USB_DEVICE(0x05c6, 0x920b)}, /* Generic Gobi 2000 Modem device */ + {USB_DEVICE(0x05c6, 0x9224)}, /* Sony Gobi 2000 QDL device (N0279, VU730) */ + {USB_DEVICE(0x05c6, 0x9225)}, /* Sony Gobi 2000 Modem device (N0279, VU730) */ + {USB_DEVICE(0x05c6, 0x9244)}, /* Samsung Gobi 2000 QDL device (VL176) */ diff --git a/usb.current/usb-option-add-support-for-1da5-4518.patch b/usb.current/usb-option-add-support-for-1da5-4518.patch new file mode 100644 index 00000000000000..e40217af1d1c71 --- /dev/null +++ b/usb.current/usb-option-add-support-for-1da5-4518.patch @@ -0,0 +1,36 @@ +From omer.ugurlu@a-kent.com Thu Jul 8 08:50:04 2010 +From: �mer Sezgin Ugurlu <omer.ugurlu@a-kent.com> +Date: Mon, 28 Jun 2010 19:01:58 +0300 +Subject: USB: option: add support for 1da5:4518 +To: Greg KH <gregkh@suse.de> +Cc: Brad Lu <Brad.Lu@qisda.com> +Message-ID: <AANLkTilFXmdcx-CRI8yx11Wrhqxv3hzzfy_xB69vkvwH@mail.gmail.com> + + +Signed-off-by: Omer Sezgin Ugurlu <omer.ugurlu@a-kent.com> +Cc: stable <stable@kernel.org> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + + +--- + drivers/usb/serial/option.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/drivers/usb/serial/option.c ++++ b/drivers/usb/serial/option.c +@@ -302,6 +302,7 @@ static void option_instat_callback(struc + #define QISDA_PRODUCT_H21_4512 0x4512 + #define QISDA_PRODUCT_H21_4523 0x4523 + #define QISDA_PRODUCT_H20_4515 0x4515 ++#define QISDA_PRODUCT_H20_4518 0x4518 + #define QISDA_PRODUCT_H20_4519 0x4519 + + /* TLAYTECH PRODUCTS */ +@@ -852,6 +853,7 @@ static const struct usb_device_id option + { USB_DEVICE(QISDA_VENDOR_ID, QISDA_PRODUCT_H21_4512) }, + { USB_DEVICE(QISDA_VENDOR_ID, QISDA_PRODUCT_H21_4523) }, + { USB_DEVICE(QISDA_VENDOR_ID, QISDA_PRODUCT_H20_4515) }, ++ { USB_DEVICE(QISDA_VENDOR_ID, QISDA_PRODUCT_H20_4518) }, + { USB_DEVICE(QISDA_VENDOR_ID, QISDA_PRODUCT_H20_4519) }, + { USB_DEVICE(TOSHIBA_VENDOR_ID, TOSHIBA_PRODUCT_G450) }, + { USB_DEVICE(TOSHIBA_VENDOR_ID, TOSHIBA_PRODUCT_HSDPA_MINICARD ) }, /* Toshiba 3G HSDPA == Novatel Expedite EU870D MiniCard */ diff --git a/usb.current/usb-s3c2410_udc-be-aware-of-connected-gadget-driver.patch b/usb.current/usb-s3c2410_udc-be-aware-of-connected-gadget-driver.patch new file mode 100644 index 00000000000000..fa86a8f511db90 --- /dev/null +++ b/usb.current/usb-s3c2410_udc-be-aware-of-connected-gadget-driver.patch @@ -0,0 +1,52 @@ +From vzapolskiy@gmail.com Thu Jul 8 08:53:54 2010 +From: Vladimir Zapolskiy <vzapolskiy@gmail.com> +Date: Tue, 29 Jun 2010 23:36:26 +0400 +Subject: USB: s3c2410_udc: be aware of connected gadget driver +To: linux-usb@vger.kernel.org +Cc: Greg Kroah-Hartman <gregkh@suse.de>, Sergei Shtylyov <sshtylyov@mvista.com>, Vladimir Zapolskiy <vzapolskiy@gmail.com> +Message-ID: <1277840186-18348-1-git-send-email-vzapolskiy@gmail.com> + + +To escape from data abort in interrupt handler, it is required to +check for a connected gadget before delivering control requests. + +The change fixes the following panic, which occurs with no loaded +gadget driver and input USB_REQ_GET_DESCRIPTOR request: + +Kernel panic - not syncing: Fatal exception in interrupt +[<c0025874>] (unwind_backtrace+0x0/0xd8) from [<c0253f14>] (panic+0x40/0x110) +[<c0253f14>] (panic+0x40/0x110) from [<c002470c>] (die+0x154/0x180) +[<c002470c>] (die+0x154/0x180) from [<c0026448>] (__do_kernel_fault+0x64/0x74) +[<c0026448>] (__do_kernel_fault+0x64/0x74) from [<c0026610>] (do_page_fault+0x1b8/0x1cc) +[<c0026610>] (do_page_fault+0x1b8/0x1cc) from [<c00202d4>] (do_DataAbort+0x34/0x94) +[<c00202d4>] (do_DataAbort+0x34/0x94) from [<c0020a60>] (__dabt_svc+0x40/0x60) +Exception stack(0xc0327ea8 to 0xc0327ef0) +7ea0: bf0026b0 c0327ef0 c0327ee4 00000000 bf002590 00000093 +7ec0: 00000001 bf0026b0 bf002990 00000000 00000008 0000143d 00003f00 c0327ef0 +7ee0: bf001364 bf001360 20000093 ffffffff +[<c0020a60>] (__dabt_svc+0x40/0x60) from [<bf001360>] (s3c2410_udc_irq+0x5b8/0x778 [s3c2410_udc]) +[<bf001360>] (s3c2410_udc_irq+0x5b8/0x778 [s3c2410_udc]) from [<c0058aa0>] (handle_IRQ_event+0x3c/0x104) +[<c0058aa0>] (handle_IRQ_event+0x3c/0x104) from [<c005a428>] (handle_edge_irq+0x12c/0x164) +[<c005a428>] (handle_edge_irq+0x12c/0x164) from [<c0020068>] (asm_do_IRQ+0x68/0x88) +[<c0020068>] (asm_do_IRQ+0x68/0x88) from [<c0020aa4>] (__irq_svc+0x24/0xa0) + +Signed-off-by: Vladimir Zapolskiy <vzapolskiy@gmail.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/usb/gadget/s3c2410_udc.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/drivers/usb/gadget/s3c2410_udc.c ++++ b/drivers/usb/gadget/s3c2410_udc.c +@@ -735,6 +735,10 @@ static void s3c2410_udc_handle_ep0_idle( + else + dev->ep0state = EP0_OUT_DATA_PHASE; + ++ if (!dev->driver) ++ return; ++ ++ /* deliver the request to the gadget driver */ + ret = dev->driver->setup(&dev->gadget, crq); + if (ret < 0) { + if (dev->req_config) { diff --git a/usb/usb-usblp-fixed-switch-brace-whitespace-and-spacing-coding-style-issues.patch b/usb/usb-usblp-fixed-switch-brace-whitespace-and-spacing-coding-style-issues.patch index 8e37c147a39a01..2bfe56d214b85b 100644 --- a/usb/usb-usblp-fixed-switch-brace-whitespace-and-spacing-coding-style-issues.patch +++ b/usb/usb-usblp-fixed-switch-brace-whitespace-and-spacing-coding-style-issues.patch @@ -10,7 +10,7 @@ Message-ID: <20100625202537.1cd4526c@absol.kitzblitz> Fixed switch, brace, whitespace and spacing coding style issues. Signed-off-by: Nicolas Kaiser <nikai@nikai.net> -Cc: Pete Zaitcev <zaitcev@redhat.com> +Acked-by: Pete Zaitcev <zaitcev@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- |
