From: Greg KH <gregkh@suse.de>
To: Linus Torvalds <torvalds@osdl.org>, Andrew Morton <akpm@osdl.org>
Cc: linux-kernel@vger.kernel.org,
linux-usb-devel@lists.sourceforge.net, david-b@pacbell.net
Subject: [patch 13/18] USB: sl811-hcd minor fixes
Date: Thu, 22 Sep 2005 00:49:07 -0700 [thread overview]
Message-ID: <20050922074907.GN15053@kroah.com> (raw)
In-Reply-To: <20050922074643.GA15053@kroah.com>
[-- Attachment #1: usb-sl811-minor-fixes.patch --]
[-- Type: text/plain, Size: 2206 bytes --]
From: David Brownell <david-b@pacbell.net>
Three minor sl811-hcd fixes:
- Elminate memory leak on one (rare) disable/shutdown path.
- For periodic transfers that don't need to be scheduled, update
urb->start_frame to represent the transfer phase correctly.
- Report the (single) port as removable, by default.
Since no drivers yet use start_frame or that part of the hub descriptor,
only that leak is likely to ever matter.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/usb/host/sl811-hcd.c | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
--- scsi-2.6.orig/drivers/usb/host/sl811-hcd.c 2005-09-20 06:00:03.000000000 -0700
+++ scsi-2.6/drivers/usb/host/sl811-hcd.c 2005-09-21 17:29:45.000000000 -0700
@@ -782,6 +782,9 @@
/* usb 1.1 says max 90% of a frame is available for periodic transfers.
* this driver doesn't promise that much since it's got to handle an
* IRQ per packet; irq handling latencies also use up that time.
+ *
+ * NOTE: the periodic schedule is a sparse tree, with the load for
+ * each branch minimized. see fig 3.5 in the OHCI spec for example.
*/
#define MAX_PERIODIC_LOAD 500 /* out of 1000 usec */
@@ -843,6 +846,7 @@
if (!(sl811->port1 & (1 << USB_PORT_FEAT_ENABLE))
|| !HC_IS_RUNNING(hcd->state)) {
retval = -ENODEV;
+ kfree(ep);
goto fail;
}
@@ -911,8 +915,16 @@
case PIPE_ISOCHRONOUS:
case PIPE_INTERRUPT:
urb->interval = ep->period;
- if (ep->branch < PERIODIC_SIZE)
+ if (ep->branch < PERIODIC_SIZE) {
+ /* NOTE: the phase is correct here, but the value
+ * needs offsetting by the transfer queue depth.
+ * All current drivers ignore start_frame, so this
+ * is unlikely to ever matter...
+ */
+ urb->start_frame = (sl811->frame & (PERIODIC_SIZE - 1))
+ + ep->branch;
break;
+ }
retval = balance(sl811, ep->period, ep->load);
if (retval < 0)
@@ -1122,7 +1134,7 @@
desc->wHubCharacteristics = (__force __u16)cpu_to_le16(temp);
/* two bitmaps: ports removable, and legacy PortPwrCtrlMask */
- desc->bitmap[0] = 1 << 1;
+ desc->bitmap[0] = 0 << 1;
desc->bitmap[1] = ~0;
}
--
next prev parent reply other threads:[~2005-09-22 7:50 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20050922003901.814147000@echidna.kroah.org>
2005-09-22 7:46 ` [patch 00/18] USB and PCI Fixes for 2.6.14-rc2 Greg KH
2005-09-22 7:47 ` [patch 01/18] Driver Core: fis bus rescan devices race Greg KH
2005-09-22 7:47 ` [patch 02/18] Driver Core: add helper device_is_registered() Greg KH
2005-09-22 7:47 ` [patch 03/18] fix class symlinks in sysfs Greg KH
2005-09-22 7:47 ` [patch 04/18] I2C: remove me from the MAINTAINERS file for i2c Greg Kroah-Hartman
2005-09-22 7:48 ` [patch 05/18] PCI: remove unused "scratch" Greg KH
2005-09-22 7:48 ` [patch 06/18] PCI: convert kcalloc to kzalloc Greg KH
2005-09-22 7:48 ` [patch 07/18] fix drivers/pci/probe.c warning Greg KH
2005-09-22 7:48 ` [patch 08/18] PCI Hotplug: Fix buffer overrun in rpadlpar_sysfs.c Greg KH
2005-09-22 7:48 ` [patch 09/18] ub: fix burning cds Greg KH
2005-09-22 7:48 ` [patch 10/18] USB: more device IDs for Option card driver Greg KH
2005-09-22 7:48 ` [patch 11/18] USB: ftdi_sio: allow baud rate to be changed without raising RTS and DTR Greg KH
2005-09-22 7:48 ` [patch 12/18] USB: fix pxa2xx_udc compile warnings Greg KH
2005-09-22 7:49 ` Greg KH [this message]
2005-09-22 7:49 ` [patch 14/18] USB: fix pegasus driver Greg KH
2005-09-22 7:49 ` [patch 15/18] usb/serial/option.c: Increase input buffer size Greg KH
2005-09-22 7:49 ` [patch 16/18] USB: Add Novatel CDMA Wireless PC card IDs to airprime Greg KH
2005-09-22 7:49 ` [patch 17/18] ub: Comment out unconditional stall clear Greg KH
2005-09-22 7:49 ` [patch 18/18] USB: Update Documentation/usb/URB.txt Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20050922074907.GN15053@kroah.com \
--to=gregkh@suse.de \
--cc=akpm@osdl.org \
--cc=david-b@pacbell.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb-devel@lists.sourceforge.net \
--cc=torvalds@osdl.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).