diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-09-02 13:12:00 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-09-02 13:12:00 -0700 |
| commit | 470ec5b9affc1625ee67df9e74701e51973d7cdf (patch) | |
| tree | ec905993dba0ba8d9bd85045cec2a9d022b453e0 | |
| parent | 29a6d6319c95efcb8830387b23501d87ca42b1e6 (diff) | |
| download | patches-470ec5b9affc1625ee67df9e74701e51973d7cdf.tar.gz | |
more bug fixes
6 files changed, 282 insertions, 0 deletions
@@ -17,6 +17,7 @@ tty.current/vt-fix-console-corruption-on-driver-hand-over.patch tty.current/maintainers-orphan-isicom.patch tty.current/serial-fix-port-type-conflict-between-ns16550a-u6_16550a.patch tty.current/serial-bfin_sport_uart-restore-transmit-frame-sync-fix.patch +tty.current/tty-fix-tty_line-must-not-be-equal-to-number-of-allocated-tty-pointers-in-tty-driver.patch ################################# @@ -37,6 +38,9 @@ usb.current/usb-cdc-acm-adding-second-acm-channel-support-for-various-nokia-and- usb.current/usb-serial-mos7840-add-usb-ids-to-support-more-b-b-usb-rs485-converters.patch usb.current/usb-cxacru-use-a-bulk-int-urb-to-access-the-command-endpoint.patch usb.current/usb-cdc-acm-add-pseudo-modem-without-at-command-capabilities.patch +usb.current/usb-cdc-acm-fixing-crash-when-acm-probing-interfaces-with-no-endpoint-descriptors.patch +usb.current/usb-ftdi_sio-added-custom-pids-for-chamsys-products.patch + ################################# @@ -46,6 +50,7 @@ staging.current/staging-hv-fix-missing-functions-for-net_device_ops.patch staging.current/staging-hv-fixed-bounce-kmap-problem-by-using-correct-index.patch staging.current/staging-hv-fixed-the-value-of-the-64bit-hole-inside-ring-buffer.patch staging.current/staging-hv-increased-storvsc-ringbuffer-and-max_io_requests.patch +staging.current/staging-hv-fixed-lockup-problem-with-bounce_buffer-scatter-list.patch staging.current/staging-spectra-needs-linux-slab.h.patch staging.current/staging-comedi-das08_cs.c-fix-io_req_t-conversion.patch staging.current/staging-rt2870sta-add-more-device-ids-from-vendor-drivers.patch @@ -126,6 +131,7 @@ usb/usb-gadget-don-t-save-bind-callback-in-struct-usb_configuration.patch usb/init.h-add-some-more-documentation-to-__ref-tags.patch usb/usb-gadget-amd5536udc.c-remove-double-test.patch usb/usb-output-an-error-message-when-the-pipe-type-doesn-t-match-the-endpoint-type.patch +usb/usb-langwell-remove-unnecessary-return-s-from-void-functions.patch # staging stuff for next is now in the staging-next tree on git.kernel.org diff --git a/staging.current/staging-hv-fixed-lockup-problem-with-bounce_buffer-scatter-list.patch b/staging.current/staging-hv-fixed-lockup-problem-with-bounce_buffer-scatter-list.patch new file mode 100644 index 00000000000000..256133629f8cab --- /dev/null +++ b/staging.current/staging-hv-fixed-lockup-problem-with-bounce_buffer-scatter-list.patch @@ -0,0 +1,66 @@ +From hjanssen@sailtheuniverse.com Thu Sep 2 13:06:54 2010 +Message-ID: <4C7E9721.2050405@sailtheuniverse.com> +Date: Wed, 01 Sep 2010 11:10:41 -0700 +From: Hank Janssen <hjanssen@microsoft.com> +To: hjanssen@microsoft.com, gregkh@suse.de, + devel@driverdev.osuosl.org, virtualization@lists.osdl.org, + linux-kernel@vger.kernel.org, Haiyang Zhang <haiyangz@microsoft.com> +Cc: Joe Perches <joe@perches.com> +Subject: staging: hv: Fixed lockup problem with bounce_buffer scatter list + +From: Hank Janssen <hjanssen@microsoft.com> + +Fixed lockup problem with bounce_buffer scatter list which caused +crashes in heavy loads. And minor code indentation cleanup in effected +area. + +Removed whitespace and noted minor indentation changes in description as +pointed out by Joe Perches. (Thanks for reviewing Joe) + +Signed-off-by: Hank Janssen <hjanssen@microsoft.com> +Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com> +Cc: stable <stable@kernel.org> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + + +--- + drivers/staging/hv/storvsc_drv.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +--- a/drivers/staging/hv/storvsc_drv.c ++++ b/drivers/staging/hv/storvsc_drv.c +@@ -615,6 +615,7 @@ static int storvsc_queuecommand(struct s + unsigned int request_size = 0; + int i; + struct scatterlist *sgl; ++ unsigned int sg_count = 0; + + DPRINT_DBG(STORVSC_DRV, "scmnd %p dir %d, use_sg %d buf %p len %d " + "queue depth %d tagged %d", scmnd, scmnd->sc_data_direction, +@@ -697,6 +698,7 @@ static int storvsc_queuecommand(struct s + request->DataBuffer.Length = scsi_bufflen(scmnd); + if (scsi_sg_count(scmnd)) { + sgl = (struct scatterlist *)scsi_sglist(scmnd); ++ sg_count = scsi_sg_count(scmnd); + + /* check if we need to bounce the sgl */ + if (do_bounce_buffer(sgl, scsi_sg_count(scmnd)) != -1) { +@@ -731,15 +733,16 @@ static int storvsc_queuecommand(struct s + scsi_sg_count(scmnd)); + + sgl = cmd_request->bounce_sgl; ++ sg_count = cmd_request->bounce_sgl_count; + } + + request->DataBuffer.Offset = sgl[0].offset; + +- for (i = 0; i < scsi_sg_count(scmnd); i++) { ++ for (i = 0; i < sg_count; i++) { + DPRINT_DBG(STORVSC_DRV, "sgl[%d] len %d offset %d\n", + i, sgl[i].length, sgl[i].offset); + request->DataBuffer.PfnArray[i] = +- page_to_pfn(sg_page((&sgl[i]))); ++ page_to_pfn(sg_page((&sgl[i]))); + } + } else if (scsi_sglist(scmnd)) { + /* ASSERT(scsi_bufflen(scmnd) <= PAGE_SIZE); */ diff --git a/tty.current/tty-fix-tty_line-must-not-be-equal-to-number-of-allocated-tty-pointers-in-tty-driver.patch b/tty.current/tty-fix-tty_line-must-not-be-equal-to-number-of-allocated-tty-pointers-in-tty-driver.patch new file mode 100644 index 00000000000000..a78df7ba8772a7 --- /dev/null +++ b/tty.current/tty-fix-tty_line-must-not-be-equal-to-number-of-allocated-tty-pointers-in-tty-driver.patch @@ -0,0 +1,44 @@ +From nathael.pajani@ed3l.fr Thu Sep 2 13:03:44 2010 +Message-ID: <4C7FAF58.9030700@ed3l.fr> +Date: Thu, 02 Sep 2010 16:06:16 +0200 +From: Nathael Pajani <nathael.pajani@ed3l.fr> +To: gregkh@suse.de, linux-kernel@vger.kernel.org +Cc: <torvalds@linux-foundation.org> +Subject: tty: fix tty_line must not be equal to number of allocated tty pointers in tty driver + +I found a bug "by chance" in drivers/char/tty_io.c + +I mean "by chance" because I was just reading the code of the +tty_find_polling_driver() to make a new tty_find_by_name() function. + +In tty_find_polling_driver() the driver actually test "tty_line <= +p->num" while num refers to the number of struct tty_struct pointers +allocated for the p->ttys (p is a tty_driver), and tty_line is scanned +in a tty name, which can be for example ttyS2. Then tty_line equals 2. +And if p->num is 2, we have only p->ttys[0] and p->ttys[1], but no +p->ttys[2]. + +This is actually unharmful, for tty_find_polling_driver() is used only +in drivers/serial/kgdboc.c, and there's a test over there to find a +console with a matching index, which will never happen. + +This is still a bug anyway. + +Signed-off-by: Nathael Pajani <nathael.pajani@ed3l.fr> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/char/tty_io.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/char/tty_io.c ++++ b/drivers/char/tty_io.c +@@ -355,7 +355,7 @@ struct tty_driver *tty_find_polling_driv + if (*stp == '\0') + stp = NULL; + +- if (tty_line >= 0 && tty_line <= p->num && p->ops && ++ if (tty_line >= 0 && tty_line < p->num && p->ops && + p->ops->poll_init && !p->ops->poll_init(p, tty_line, stp)) { + res = tty_driver_kref_get(p); + *line = tty_line; diff --git a/usb.current/usb-cdc-acm-fixing-crash-when-acm-probing-interfaces-with-no-endpoint-descriptors.patch b/usb.current/usb-cdc-acm-fixing-crash-when-acm-probing-interfaces-with-no-endpoint-descriptors.patch new file mode 100644 index 00000000000000..48c80391d2dc16 --- /dev/null +++ b/usb.current/usb-cdc-acm-fixing-crash-when-acm-probing-interfaces-with-no-endpoint-descriptors.patch @@ -0,0 +1,40 @@ +From toby.gray@realvnc.com Thu Sep 2 13:02:31 2010 +From: Toby Gray <toby.gray@realvnc.com> +To: Oliver Neukum <oliver@neukum.name> +Cc: Greg Kroah-Hartman <gregkh@suse.de>, stable@kernel.org, + linux-usb@vger.kernel.org, Toby Gray <toby.gray@realvnc.com> +Subject: USB: cdc-acm: Fixing crash when ACM probing interfaces with no endpoint descriptors. +Date: Thu, 2 Sep 2010 10:46:20 +0100 +Message-Id: <1283420780-13510-1-git-send-email-toby.gray@realvnc.com> + +Certain USB devices, such as the Nokia X6 mobile phone, don't expose any +endpoint descriptors on some of their interfaces. If the ACM driver is forced +to probe all interfaces on a device the a NULL pointer dereference will occur +when the ACM driver attempts to use the endpoint of the alternative settings. +One way to get the ACM driver to probe all the interfaces is by using the +/sys/bus/usb/drivers/cdc_acm/new_id interface. + +This patch checks that the endpoint pointer for the current alternate settings +is non-NULL before using it. + +Signed-off-by: Toby Gray <toby.gray@realvnc.com> +Cc: Oliver Neukum <oliver@neukum.name> +Cc: stable <stable@kernel.org> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/usb/class/cdc-acm.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/drivers/usb/class/cdc-acm.c ++++ b/drivers/usb/class/cdc-acm.c +@@ -965,7 +965,8 @@ static int acm_probe(struct usb_interfac + } + + if (!buflen) { +- if (intf->cur_altsetting->endpoint->extralen && ++ if (intf->cur_altsetting->endpoint && ++ intf->cur_altsetting->endpoint->extralen && + intf->cur_altsetting->endpoint->extra) { + dev_dbg(&intf->dev, + "Seeking extra descriptors on endpoint\n"); diff --git a/usb.current/usb-ftdi_sio-added-custom-pids-for-chamsys-products.patch b/usb.current/usb-ftdi_sio-added-custom-pids-for-chamsys-products.patch new file mode 100644 index 00000000000000..3b9ea5d45e268f --- /dev/null +++ b/usb.current/usb-ftdi_sio-added-custom-pids-for-chamsys-products.patch @@ -0,0 +1,58 @@ +From luke@chamsys.co.uk Thu Sep 2 13:03:00 2010 +From: Luke Lowrey <luke@chamsys.co.uk> +To: gregkh@suse.de +Cc: jhovold@gmail.com, andi@lisas.de, linux-usb@vger.kernel.org, + linux-kernel@vger.kernel.org, Luke Lowrey <luke@chamsys.co.uk> +Subject: USB: ftdi_sio: Added custom PIDs for ChamSys products +Date: Thu, 2 Sep 2010 11:39:49 +0100 +Message-Id: <1283423989-5710-1-git-send-email-luke@chamsys.co.uk> + +Added the 0xDAF8 to 0xDAFF PID range for ChamSys limited USB interface/wing products + +Signed-off-by: Luke Lowrey <luke@chamsys.co.uk> +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 | 12 ++++++++++++ + 2 files changed, 20 insertions(+) + +--- a/drivers/usb/serial/ftdi_sio.c ++++ b/drivers/usb/serial/ftdi_sio.c +@@ -753,6 +753,14 @@ static struct usb_device_id id_table_com + { USB_DEVICE(FTDI_VID, SEGWAY_RMP200_PID) }, + { USB_DEVICE(IONICS_VID, IONICS_PLUGCOMPUTER_PID), + .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, ++ { USB_DEVICE(FTDI_VID, FTDI_CHAMSYS_24_MASTER_WING_PID) }, ++ { USB_DEVICE(FTDI_VID, FTDI_CHAMSYS_PC_WING_PID) }, ++ { USB_DEVICE(FTDI_VID, FTDI_CHAMSYS_USB_DMX_PID) }, ++ { USB_DEVICE(FTDI_VID, FTDI_CHAMSYS_MIDI_TIMECODE_PID) }, ++ { USB_DEVICE(FTDI_VID, FTDI_CHAMSYS_MINI_WING_PID) }, ++ { USB_DEVICE(FTDI_VID, FTDI_CHAMSYS_MAXI_WING_PID) }, ++ { USB_DEVICE(FTDI_VID, FTDI_CHAMSYS_MEDIA_WING_PID) }, ++ { USB_DEVICE(FTDI_VID, FTDI_CHAMSYS_WING_PID) }, + { }, /* Optional parameter entry */ + { } /* Terminating entry */ + }; +--- a/drivers/usb/serial/ftdi_sio_ids.h ++++ b/drivers/usb/serial/ftdi_sio_ids.h +@@ -135,6 +135,18 @@ + #define FTDI_NDI_AURORA_SCU_PID 0xDA74 /* NDI Aurora SCU */ + + /* ++ * ChamSys Limited (www.chamsys.co.uk) USB wing/interface product IDs ++ */ ++#define FTDI_CHAMSYS_24_MASTER_WING_PID 0xDAF8 ++#define FTDI_CHAMSYS_PC_WING_PID 0xDAF9 ++#define FTDI_CHAMSYS_USB_DMX_PID 0xDAFA ++#define FTDI_CHAMSYS_MIDI_TIMECODE_PID 0xDAFB ++#define FTDI_CHAMSYS_MINI_WING_PID 0xDAFC ++#define FTDI_CHAMSYS_MAXI_WING_PID 0xDAFD ++#define FTDI_CHAMSYS_MEDIA_WING_PID 0xDAFE ++#define FTDI_CHAMSYS_WING_PID 0xDAFF ++ ++/* + * Westrex International devices submitted by Cory Lee + */ + #define FTDI_WESTREX_MODEL_777_PID 0xDC00 /* Model 777 */ diff --git a/usb/usb-langwell-remove-unnecessary-return-s-from-void-functions.patch b/usb/usb-langwell-remove-unnecessary-return-s-from-void-functions.patch new file mode 100644 index 00000000000000..fcdce57534c3c3 --- /dev/null +++ b/usb/usb-langwell-remove-unnecessary-return-s-from-void-functions.patch @@ -0,0 +1,68 @@ +From jkosina@suse.cz Thu Sep 2 13:04:41 2010 +Date: Thu, 2 Sep 2010 16:34:36 +0200 (CEST) +From: Jiri Kosina <jkosina@suse.cz> +To: Greg KH <greg@kroah.com> +Cc: Stephen Rothwell <sfr@canb.auug.org.au>, + linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, + JiebingLi <jiebing.li@intel.com>, Joe Perches <joe@perches.com> +Subject: USB: langwell: Remove unnecessary return's from void functions +Message-ID: <alpine.LNX.2.00.1009021633020.26813@pobox.suse.cz> + +From: Joe Perches <joe@perches.com> + +There are about 2500 void functions in drivers/usb +Only a few used return; at end of function. + +Standardize them a bit. + +Signed-off-by: Joe Perches <joe@perches.com> +Signed-off-by: Jiri Kosina <jkosina@suse.cz> +Cc: Stephen Rothwell <sfr@canb.auug.org.au> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/usb/gadget/langwell_udc.c | 5 ----- + 1 file changed, 5 deletions(-) + +--- a/drivers/usb/gadget/langwell_udc.c ++++ b/drivers/usb/gadget/langwell_udc.c +@@ -254,7 +254,6 @@ static void ep0_reset(struct langwell_ud + } + + dev_vdbg(&dev->pdev->dev, "<--- %s()\n", __func__); +- return; + } + + +@@ -1502,7 +1501,6 @@ static void langwell_udc_start(struct la + writel(usbcmd, &dev->op_regs->usbcmd); + + dev_dbg(&dev->pdev->dev, "<--- %s()\n", __func__); +- return; + } + + +@@ -1525,7 +1523,6 @@ static void langwell_udc_stop(struct lan + writel(usbcmd, &dev->op_regs->usbcmd); + + dev_dbg(&dev->pdev->dev, "<--- %s()\n", __func__); +- return; + } + + +@@ -2417,7 +2414,6 @@ delegate: + } + end: + dev_vdbg(&dev->pdev->dev, "<--- %s()\n", __func__); +- return; + } + + +@@ -2633,7 +2629,6 @@ static void handle_trans_complete(struct + } + done: + dev_vdbg(&dev->pdev->dev, "<--- %s()\n", __func__); +- return; + } + + |