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

Well, it works only for UHCI controllers, but that's not acceptable...
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

It just occured to me that urb->timeout is not functional.

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

Gadget API update.  Covers OTG support, lists a few more
types of hardware support, mentions gadget driver updates
including RNDIS, serial with CDC-ACM, and gadgetfs AIO.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

Minor gadget zero fixes:

 - correct string descriptions:  they're always UTF-8
 - for OTG, report HNP and remote wakeup support
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

Teach usbcore how to enumerate OTG devices and perform HNP:

 - CONFIG_USB_OTG is a boolean; it selects CONFIG_USB_SUSPEND.
   Boards with a Mini-AB connector should offer it as a config
   option; no other hardware could support OTG.

 - Before resetting a port, make sure it's not still suspended.
   (For example, after an HNP role switch.)

 - When an OTG A-Host enumerates a dual-role device, set the
   appropriate device feature:  B_HNP_ENABLE if it's connected
   to the OTG port, otherwise A_ALT_HNP_SUPPORT.

 - When an OTG B-Host enumerates a dual-role device, don't
   bother debouncing ... the power session is stable already,
   the A-Host already debounced.

 - The OTG "Targeted Peripheral List" lives in a product-customized
   "otg_whitelist.h" header.

 - CONFIG_USB_OTG_WHITELIST lets developers choose to ignore whitelist
   failures, so unsupported devices can be configured anyway.

 - If the whitelist check fails, immediately suspend the device.

    * For dual-role devices, that triggers HNP so the other device
      can try to act as host.

    * For peripheral-only devices, that conserves power ... but not
      quite as much as turning off power on that port, which should
      eventually be done with OTG ports (and all other ports that
      support SRP).

The whitelist logic tries to make use of the existing usb_device_id
logic, but since the interface info isn't available that early it's
a bit awkward use information anywhere outside the device descriptor.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

Generic OTG and reset support for OTG.

 - Declare and use a start_hnp() board-specific procedure.  The OMAP
   implementation will come separately, it can't yet be configured.

 - When OTG is configured, implement the usb_bus_start_enum() hook;
   that just starts a root port reset.

 - When some task (usually khubd) resets a root port, make sure it takes
   the full 50 msec.  The OHCI reset timer is in hardware, and the host
   may need to issue multiple resets to guard against concurrent resume.

 - For backward compatibility, don't kick in the new 50 msec logic unless
   it could be needed:  without CONFIG_USB_SUSPEND, nothing will suspend
   so nothing could resume.  Which is good, at least until we start to
   measure how long a reset takes ... it seems chip-specific.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

Define a new usb_bus_start_enum() routine that's available with OTG.
It starts immediate enumeration (port reset) and makes khubd wake up
later.  Non-OTG code could start to use this, given some attention to
HC-specific reset timing issues.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

drivers/usb/misc/legousbtower.c: In function `__check_read_buffer_size':
drivers/usb/misc/legousbtower.c:119: warning: return from incompatible pointer type
drivers/usb/misc/legousbtower.c: In function `__check_write_buffer_size':
drivers/usb/misc/legousbtower.c:129: warning: return from incompatible pointer type

The fix is awkward - module_param() doesn't like size_t's.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

It turns out that the Konica-Minolta DiMAGE A2 camera, in addition to all
its other problems, returns a 0-length reply to the GetMaxLUN request.
With this patch (accept a null reply as meaning a single LUN) it is
somewhat useable.

It's amazing to me that vendors have this much trouble counting to 1....
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Matthew Dharm <mdharm-usb@one-eyed-alien.net>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

This patch adds an unusual_devs.h entry for the Apacer Audio Steno, which
reports its capacity as total number of blocks rather than largest block
number (i.e., the value is off by one).  Please apply.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

This patch has been hanging around for a while and seems to have been
forgotten.  It fixes a bug in the USB scatter-gather library that crops up
when submission of an URB fails, and it fixes a bug in the cleanup routine
when some of the URBs being cleaned up have already completed.

I think David will agree that the patch is correct.  Please apply.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

Don't clear ep0 status phase handshake during endpoint reset ... at least
one driver emits so much debug output before resetting endpoints that the
reset happens late enough to make the chip break protocol.

Also handle resets IRQs a bit differently:  they can happen twice during
enumeration, which can worsen the other problem.

From:          Alex Sanks <alex@netchip.com>
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

Recognize the UDC for the Sharp LH7A40x chips (ARMv4t SOCs)
  - define gadget_is_lh7a40x() macro
  - gadget drivers use it to assign bcdDevice
  - supports CDC Ethernet (and RNDIS)

From: Bo Henriksen
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

 - Updated io_fw_down3.h for the io_ti driver to firmware
   version 4.10.0 from IO Networks.
Signed-off-by: Al Borchers <alborchers@steinerpoint.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

 - Updated io_fw_down.h for the io_edgeport driver to firmware
   version 1.16.4 from IO Networks.
Signed-off-by: Al Borchers <alborchers@steinerpoint.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

 - Updated io_usbvend.h to the latest version of usbvend.h
   provided by IO Networks.

 - Removed Black Box OEM device ids--they are duplicates of
   existing Edgeport ids and no longer included in IO Networks
   version of usbvend.h.

 - Removed the 1 port device from the io_edgeport driver--this
   device is a parallel port handled by the usblp driver.
Signed-off-by: Al Borchers <alborchers@steinerpoint.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

Changes:

- Delete the correct entry in the outgoing queue during DQBUF
- Implement correct image downscaling selection through VIDIOC_S_[CROP|FTM]
- Replace darkness controls with brightness (simple swapping) for PAS106B and
  PAS202BCB
- Implement gain control for TAS5110C1B and TAS5130D1B
- Add a note to the documentation about correct image downscaling selection
Signed-off-by: Luca Risolia <luca.risolia@studio.unibo.it>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

This patch fixes the error in the UHCI driver found by Stuart Hayes.  It
adds the UHCI_PTR_QH bit into the initial entries stored in the hardware
framelist.  It's not entirely clear how the driver ever managed to work
with these bits not set; apparently by coincidence the QH entries
resembled TD entries sufficiently closely to fool the hardware.


On Tue, 10 Aug 2004 Stuart_Hayes@Dell.com wrote:

> Never mind, I figured it out.  It looks like the uhci-hcd driver
> doesn't add a "| UHCI_PTR_QH" to the pointers that it puts
> in the frame list.  This causes the ICH to think that the frame list
> is pointing to a bunch of TDs instead of QHs for purposes of
> checking for TD errors.  I can only assume that the ICH
> is actually treating the frame list entries as QH pointers in spite
> of that bit not being set when it is actually executing the
> schedule, or else I don't think it would work generally.
>
> I guess the high addresses were just making the QH look like an
> invalid TD instead of a valid TD... not sure exactly what the ICH
> is checking for!
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

Once again a (small) patch for the phidgetservo driver.

Some servos have a very high maximum angle, set upper limit to the
maximum allowed by the hardware. Reported by Mario Scholz
<mario@expires-0409.mail.trial-n-error.net>
Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

This patch changes hose_list from a simple linked list to a
"list.h"-style list.  This is in preparation for the runtime
addition/removal of PCI Host Bridges.
Signed-off-by: John Rose <johnrose@austin.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

On some platforms (notably power5) you can't enable surveillance
(firmware/service processor watchdog) from the kernel - you have to do
it in the firmware.

This patch changes enable_surveillance() to make the message that is
printed in this situation more informative.  Additionaly, the rtas_call
was changed to rtas_set_indicator so as to avoid having to handle
RTAS_BUSY returns.
Signed-off-by: Nathan Fontenot <nfont@austin.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

The code doesn't actually _care_ about 32/64-bit issues,
only about F_SETLK vs F_SETLKW, and the F_SETLK64 doesn't
exist except as a compatibility thing on 64-bit architectures
(since the regular one already _is_ 64-bit, of course).

into fys.uio.no:/home/linux/bitkeeper/nfsclient-2.6

   server are not allowed to be interrupted as that may result in the
   client and server disagreeing.

   recall ability.
Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

   NFS4ERR_CB_PATH_DOWN error.

Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

into fys.uio.no:/home/linux/bitkeeper/work/nfsclient-2.6