This patch makes some simple cleanups in the UHCI driver:

	It introduces msecs_to_jiffies() conversions and uses msleep().

	It wakes up threads waiting for an endpoint to be disabled
	in the oddball case where interrupts aren't working.  (This
	should have been in a previous patch but I missed it.)

	It disables PCI interrupt generation whenever the controller
	is reset and enables it when the controller is started.  This
	may possibly solve some people's problems with suspend/resume.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

Signed-off-by: Joe Nardelli <jnardelli@infosciences.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

I have created a patch to add support for ATEN device in pegasus usb driver.
I've sent the patch to the maintainer stated in pegasus.h but after several
weeks I didn't recieve a response, so I'm sending it to you now. The patch
should apply cleanly on 2.6.6, but it doesn't apply cleanly on todays -bk as
there was some patch adding some other device. One thing I'm not 100% sure
are the flags specified to PEGASUS_DEV, what means HAS_HOME_PNA?
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

No one uses devfs on 2.6 :)
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

Here is a patch based on 2.6.7-rc2 that makes the Kyocera 7135 work.
The Kyocera appears to have the same setup as the Trio.  Its endpoints
are laid out like this:

> >>>type                  address
> >>>usb bulk out:         0x01
> >>>usb interrupt in:     0x82
> >>>usb bulk out:         0x03
> >>>usb bulk in:          0x84
The last two are the ones used for the syncing communication.

So the patch adds the ids for the kyocera and makes the treo_attach
function handle the kyocera too.  I also changed the comment; it appears
there was an error in the original comment about the treo:

Joe Nardelli wrote:
> Actually, the comment isn't quite right for Treos either (oops).  It
> should read:
>
> ...
> 1st bulk in endpoint to communicate with the 2nd bulk out endpoint
> ...
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

On Sat, 29 May 2004, Jens Axboe wrote:

> > > Both 2.6.7-rc1 and BK current spit out a bunch of:
> > >
> > > drivers/usb/class/usblp.c: usblp1: nonzero read/write bulk status received: -2
> > > drivers/usb/class/usblp.c: usblp1: error -2 reading from printer
> > > drivers/usb/class/usblp.c: usblp1: error -115 reading from printer
> > > drivers/usb/class/usblp.c: usblp1: error -115 reading from printer
> > > ...
> > >
> > > (about ~80 of that last line) but work for me.

> Sorry wasn't quite clear - the above messages are with 2.6.7-rc1 and
> current bk with your patch backed out. Current bk with the patch reports
> only the timeouts I originally listed.

Okay, I feel better.

It looks like those errors you see are caused by a bug in the usblp
driver.  The patch below ought to help.

Oops, this broke device removal pretty badly :(
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

This patch moves usb_new_device(), usb_disconnect(), usb_choose_address(),
and usb_release_address() from usb.c to hub.c.  As a side benefit,
choose_address() and release_address() can now become static.  The other
two can't, because they have to be exported for use by HCD's when
registering/unregistering root hubs.

Some other features of the patch:

	The usb_snddefctrl() and usb_rcvdefctrl() macros have been
	removed, since only one of them was used and only in one spot.

	The comment about configuration choice needing to interact with
	hub power budgeting has been moved in accordance with David's
	wish.  usb_new_device() checks to make sure a configuration
	could be chosen and logs a warning if no choice was made.

	Following Linus's preference, the #ifdef preprocessor stuff has
	been removed from around the calls the show_string routine.  It
	is now defined as a non-inline routine when debugging is enabled
	and as an inline no-op otherwise (the compiler will optimize
	away the useless tests).
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

Greg:

This patch takes care of some small miscellaneous items in hub.c:

	Move the definition of CONFIG to the right place;

	Print the proper value for submission status in the error log;

	Remove an unused list of all hubs;

	Remove some unneeded braces;

	Kill an accidentally-resurrected comment.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

acm uses a workqueue to defer part of a write operation.
In case of disconnect this work must be waited for.
  - fix race between write and disconnect
Signed-off-by: Oliver Neukum <oliver@neukum.name>
Signed-off-by: Vojtech Pavlik <vojtech@suse.cz>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

Hi,

fix access to urb->status by introduction of an explicit flag
for finished data transfer.
  - fix racy access to urb->status
Signed-off-by: Oliver Neukum <oliver@neukum.name>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

this adds error handling to the open method of the cdc acm driver.
The change set is relative to my last patch rewriting probe.
  - add error handling to open method
Signed-off-by: Oliver Neukum <oliver@neukum.name>
Signed-off-by: Vojtech Pavlik <vojtech@suse.cz>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

this changes acm_probe() to using the proper union descriptor.
It contains the workaround David suggested. Please apply.

  - fix probing to use cdc union descriptor
Signed-off-by: Oliver Neukum <oliver@neukum.name>
Signed-off-by: Vojtech Pavlik <vojtech@suse.cz>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

This patch stops changing the reported fault mode in cases where retries of
GET_DESCRIPTOR fail because the device just doesn't have such a descriptor.
Plus, it stops printing messages when retrying.

It also reduces the number of retries; the first retry seems to resolve most
of these firmware problems.
Signed-Off-By: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

This fixes a problem that all pxa2xx_udc g_ether devices
would run into.  They'd give the wrong descriptors, like:

> --------msg1- usbview ----------
> Device Descriptor: bcdUSB:             0x0200
> bDeviceClass:         0xFF
> bDeviceSubClass:      0x00
> bDeviceProtocol:      0x00
> bMaxPacketSize0:      0x10 (16)

Windows doesn't like RNDIS-supporting devices to point
out that they're really vendor-specific.  So this patch
makes sure they don't.
Signed-off-by: David Brownell <dbrownelL@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

usb: Based on a 2.4 patch from John_Hull@Dell.com, this patch
     serializes usb storage and usbfs operation, so that usbfs
     cannot disturb storage by seemingly harmless control reads.
Signed-off-by: Vojtech Pavlik <vojtech@suse.cz>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

This patch adds support in unusual_devs.h for the ISD-300 USB controller
used in CD-ROM enclosures.

With it, since 2.6.0 it allowed me to move gigabytes of data and worked
without a hitch.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

Greg:

This patch fixes a bug in disconnect handling for the dummy_hcd driver.
After a disconnect the driver would still accept URBs for endpoint 0,
leading to an oops.  It also improves the ad-hoc technique used by the
driver to track its gadget's struct usb_device and fixes the way
port-power changes are handled.  Please apply.

Alan Stern
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

On Mon, 3 May 2004, zcat wrote:

> I am trying to get my camera going as a webcam (concord EyeQ Duo in PC
> mode, not HDD mode) with the 2.6.4 kernel using the se401 driver
> (compiled in).. It logged the following message, which doesn't mean much
> to me so I have no idea if it's useful information or not;
>
> May  3 21:08:11 mrsnorris kernel: usb 1-1: new full speed USB device
> using address 2
> May  3 21:08:16 mrsnorris kernel: usb 1-1: control timeout on ep0out
> May  3 21:08:16 mrsnorris kernel: usb-storage: This device
> (0595,4343,0100 S 00 P 00) has an unneeded Protocol entry in unusual_devs.h
> May  3 21:08:16 mrsnorris kernel:    Please send a copy of this message
> to <linux-usb-devel@lists.sourceforge.net>

This fixes the "unneeded Protocol entry" message.  We never solved the
control timeout problem.

Alan Stern
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

into ppc970.osdl.org:/home/torvalds/v2.6/linux

This patch improves some of the handling of PA-RISC tulip cards.

 - Introduce HAS_SWAPPED_SEEPROM and NEEDS_FAKE_MEDIA_TABLE
 - Only trigger this code on GSC machines.  The pure PCI machines don't
   have these cards.
 - Allow the chip_name to be overridden in tulip_init_one().
 - Fix some indentation.
 - Handle the output from tulip_read_eeprom() better.

> From: Ralf Baechle <ralf@linux-mips.org>
> Subject: [PATCH] Stop queue on close in hdlcdrv
> To: Jeff Garzik <garzik@gtf.org>
> Date: Tue, 4 May 2004 13:59:15 +0200
>
> The stop method of a driver should ensure queueing is stopped ...
>
> diff -u -r1.19 hdlcdrv.c
> --- suckage/drivers/net/hamradio/hdlcdrv.c 12 Apr 2004 20:23:32 -0000

the above means the following is needed for my drivers - please apply to 2.6:

i386 gets it implicitly from somewhere but some architectures don't.
Also move <asm/uaccess.h> down so we have asm after linux headers.

s2io_rem_nic() is marked __exit and is being referred to from .data.
Signed-off-by: Andrew Morton <akpm@osdl.org>

From: "Luiz Fernando N. Capitulino" <lcapitulino@prefeitura.sp.gov.br>

drivers/net/ixgb/ixgb_main.c: In function `ixgb_intr':
drivers/net/ixgb/ixgb_main.c:1593: warning: unused variable `hw'
(catch by J. Cherry).

This happens because `hw' is only used when CONFIG_IXGB_NAPI is not set.
As `hw' is used only to have the code readable, we can use it for
!CONFIG_IXGB_NAPI too.
Signed-off-by: Andrew Morton <akpm@osdl.org>

into redhat.com:/spare/repo/net-drivers-2.6

into ppc970.osdl.org:/home/torvalds/v2.6/linux

into ppc970.osdl.org:/home/torvalds/v2.6/linux

into nuts.davemloft.net:/disk1/BK/sparc-2.6

into kernel.bkbits.net:/home/davem/bluetooth-2.6

Some RTX Telecom based USB dongles offer SCO support, but their
implementation is broken. This patch disables the use of the ISOC
interface for these devices.

If no channel is specified for a RFCOMM server socket, it will search
for the next free one and automaticly bind to it.

Proposed by Stephen Crane <steve.crane@rococosoft.com>

If no PSM is specified for a L2CAP server socket, it will search
for the next free one and automaticly bind to it.

Proposed by Stephen Crane <steve.crane@rococosoft.com>

This patch allocates the next free protocol number for the upcoming
HIDP support.

This patch updates the address of the BlueZ project and changes
some wording of the help entries.

Since we are using Bitkeeper the CVS tags are useless. This patch
removes them and makes some whitespace cleanups.

With Linux 2.6 there is no need to keep the function exports in a
central file and thus the use of syms.c makes no real sense. Remove
it and add the EXPORT_SYMBOL calls to the functions they belong to.

into ppc970.osdl.org:/home/torvalds/v2.6/linux

The timing calculations used by the PXA platforms did not always take
account of the timings handed to us by PCMCIA, and where it did, it
assumed IO timings for memory windows.

We fix this, and provide a generic function which calculates the
required timings (in nanoseconds) for IO, memory and attribute
windows.  The SOC drivers only have to convert this information to
whatever format the hardware requires to achieve at least these
timing parameters.