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

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

This fixes following issues for PIO-in:
 - shared PCI IRQs handling
 - fail request if the last status is bad
and PIO-out:
 - set hwgroup->handler/timer in prehandlers
 - handle drive->unmask in prehandlers
 - check for !rq->nr_sectors and DRQ_STAT bit set
 - use drive->bad_wstat instead of BAD_W_STAT
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This fixes a couple of CONFIG_IDE_TASKFILE_IO=n issues:
 - check status after last sector for PIO-in transfers
 - handle drive->unmask properly in PIO-out prehandlers
 - use rq->[hard]_nr_sectors where appropriate
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Don't do partial completions but instead acknowledge already transferred
sectors with verified good status on error.  This allows us to complete
"good" sectors to block layer even if bio they belong to wasn't finished
and simplifies code.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

drive_is_ready() reads STATUS register if CONFIG_IDEPCI_SHARE_IRQ is not
defined and ALTSTATUS register if it is defined.  Therefore drive_is_ready()
in pre_task_mulout_intr() only makes sense if we can't trust STATUS register
(because we call ide_wait_stat() which reads STATUS register earlier).

Remove this "workaround" for now as it is not present in ide-disk.c
and whole multi PIO-out code (CONFIG_IDE_TASKFILE_IO=n) was buggy before.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

disable_irq_nosync() in ide-io.c:ide_do_request() protects
pre_task_out_intr() from racing with the task_out_intr().
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

We shouldn't ever get there if drive is busy and we can't start transfer
in this case.  ide-disk.c:read_intr() also doesn't check for BUSY_STAT bit.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

We shouldn't ever get into ->handler() if drive is busy so
just call ->error() unconditionally if status check fails.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Setup handler and output first data block directly from ->prehandler()
instead of calling ->handler().  The only change in functionality is that
we no longer check DRIVE_READY status bits (there is no need to do it).
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

 - in task_out_intr() fix off-by-1 bug and (stat & DRQ_STAT) check,
   previously "if" was always true for rq->current_nr_sectors == 1
 - fail request if DRQ_STAT is not set and rq->current_nr_sectors != 0
   (instead of setting handler and waiting for the next IRQ) or if DRQ_STAT
   is set but !rq->current_nr_sectors (in task_mulout_intr() this was OK)
 - in task_mulout_intr() check also DRIVE_READY and WRERR_STAT status bits
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

into kroah.com:/home/greg/linux/BK/i2c-2.6

This patch unhides the SMBus on the hp nc8000 and nc6000 laptops. The
patch has been co-written by Jean Delvare and Rudolf Marek. I've only
tested this on nc8000, but it should work for the nc6000 too.

Unfortunatley, we had to little information to fix the problem described
in the reported bug below, as is probably the same problem. But if we're
very lucky it might solve it too.
http://bugzilla.kernel.org/show_bug.cgi?id=2976Signed-off-by: Örjan Persson <orange@fobie.net>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

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

The hardware vendor, in their infinite wisdom, make the combined
mode configuration register different between ICH5 and ICH6.

Take this into account.

Obvious bug.  Fixes highmem oops.

On Tue, Jul 13, 2004 at 06:25:59PM -0700, Andrew Morton wrote:
>...
> All 252 patches:
>...
> bk-usb.patch
>...

This patch marks w9968cf_valid_depth as inline, although it's used
before it's defined.

gcc 3.4 therefore correctly fails with:

<--  snip  -->

...
  CC      drivers/usb/media/w9968cf.o
drivers/usb/media/w9968cf.c: In function `w9968cf_set_picture':
drivers/usb/media/w9968cf.c:487: sorry, unimplemented: inlining failed
in call to 'w9968cf_valid_depth': function body not available
drivers/usb/media/w9968cf.c:1722: sorry, unimplemented: called from here
make[3]: *** [drivers/usb/media/w9968cf.o] Error 1

<--  snip  -->


This patch moves w9968cf_valid_depth above it's first user (it also uses
two other functions to keep the ordering of functions a bit more
consistent).
Signed-off-by: Adrian Bunk <bunk@fs.tum.de>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

Signaling (even D- vs D+ pullup) may not be stable
for a while.

At least one OTG root hub won't reliably (<10%) report device speed until
after reset (and the OTG state transitions have quiesced for a while).

This patch makes that not matter.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

Signed-off-by: Luca Risolia <luca.risolia@studio.unibo.it>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

This adds some of the infrastructure needed to support some more
USB capabilities:

 -  CONFIG_USB_SUSPEND, so Linux can put individual devices
    into the USB "suspend" state.  They can (sometimes) use
    "remote wakeup" to resume the host; or they can each be
    resumed by the host.

      + New usbcore device selective suspend/resume APIs
	* Define them, as stubs for now
	* Call them on the paths sysfs uses (renamed functions)
      + HCD support
	* Define root hub suspend calls; delegate them to HCDs.
	* OHCI and EHCI can suspend/resume root hubs that way.
	* Not called yet, until suspend/resume calls exist

 -  CONFIG_USB_OTG, which depends on the selective suspend APIs
    to allow devices to switch roles (host to peripheral, etc).
    This patch just adds a few key flags in usb_bus, needed by
    usbcore (during enumeration) and by HCD and OTG controllers
    on OTG-capable boards.

 -  Related bugfix:  power budgeting is supposed to place a
    100mA per port (non-OTG) for bus-powered devices.

This patch changes no behavior; later patches will do that,
and they'll be smaller because of this.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

Greg,

This patch adds various VID/PIDs to the ftdi_sio driver that I've
accumulated from the ftdi-usb-sio-devel mailing list, and one from
the 2.4 kernel sources:

* Interbiometrics USB I/O boards VID/PIDs from 2.4 kernel (Rudolf
  Gugler).
* Intrepid Control Systems ValueCAN and NeoVI VID/PIDs from Scott
  Wolchok.
* Falcom Twist USB GPRS modem VID/PID from Justin Schoeman.
* Suunto Sports instrument PID from Panu Kekalainen.

Also a few minor clean-ups:

* Removed a stray PID macro constant FTDI_GUDEADS_889_PID.
* Copied the Inside Accesso VID/PID into the FT232BM ID table so
  that the "combined" table is a proper union of the others (unless I've
  missed something else).
* Added a comment that the OCT US101 is also rebadged as a SIIG Inc.
  US2308.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

Someone spotted that ftdi_sio outputs a debug trace for TIOCMGET,
but not for TIOCMSET, so this patch adds a debug trace for TIOCMSET
too.

Signed off by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

Signed-off-by: Luiz Capitulino <lcapitulino@prefeitura.sp.gov.br>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

However, attached I provide you a patch against 2.6.7 which should add
the ASUS A620 PDA to the ipaq Kernel module.
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

added another device to unusual_devs.h. Its a Sony Clie PEG-675C. Now I
can mount the memory stick.

cat /proc/bus/usb/devices

T:  Bus=03 Lev=01 Prnt=01 Port=01 Cnt=01 Dev#= 18 Spd=12  MxCh= 0
D:  Ver= 1.10 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=16 #Cfgs=  1
P:  Vendor=054c ProdID=0099 Rev= 1.00
S:  Manufacturer=Sony
S:  Product=Sony PEG Mass Storage
C:* #Ifs= 1 Cfg#= 1 Atr=c0 MxPwr=  6mA
I:  If#= 0 Alt= 0 #EPs= 3 Cls=08(stor.) Sub=05 Prot=00 Driver=usb-storage
E:  Ad=81(I) Atr=03(Int.) MxPS=  64 Ivl=1ms
E:  Ad=02(O) Atr=02(Bulk) MxPS=  64 Ivl=0ms
E:  Ad=82(I) Atr=02(Bulk) MxPS=  64 Ivl=0ms
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

 On Sun, Jul 11, Luca Risolia wrote:

> This single patch contains some updates and cleanups for
> the W996[87]CF driver and a new experimental V4L2 driver
> for SONiX SN9C10[12] PC Camera Controllers connected to various
> image sensors. I have not divided the patch in two logical
> sub-patches becouse of two independent changes in one common
> file, KConfigure. Since this mailing list refused the patch,
> due to its size, I have uploaded it here, as
> Documentation/SubmittingPatches suggests:

I need this patch for x86_64.


  CC [M]  drivers/usb/media/sn9c102_core.o
In file included from drivers/usb/media/sn9c102.h:34,
                 from drivers/usb/media/sn9c102_core.c:43:
include/asm/rwsem.h:55: error: redefinition of `struct rw_semaphore'
In file included from drivers/usb/media/sn9c102.h:34,
                 from drivers/usb/media/sn9c102_core.c:43:
include/asm/rwsem.h:79:1: warning: "__RWSEM_INITIALIZER" redefined
In file included from include/linux/rwsem.h:25,
                 from include/asm/semaphore.h:43,
                 from include/linux/sched.h:18,
                 from include/linux/module.h:10,
                 from drivers/usb/media/sn9c102_core.c:21:
include/linux/rwsem-spinlock.h:49:1: warning: this is the location of the previous definition
include/asm/rwsem.h:87: warning: static declaration for `init_rwsem' follows non-static
include/asm/rwsem.h:100: warning: `__down_read' declared inline after being called
include/asm/rwsem.h:100: warning: static declaration for `__down_read' follows non-static
include/asm/rwsem.h:122: warning: `__down_read_trylock' declared inline after being called
include/asm/rwsem.h:122: warning: static declaration for `__down_read_trylock' follows non-static
include/asm/rwsem.h:146: warning: `__down_write' declared inline after being called
include/asm/rwsem.h:146: warning: static declaration for `__down_write' follows non-static
include/asm/rwsem.h:171: warning: `__down_write_trylock' declared inline after being called
include/asm/rwsem.h:171: warning: static declaration for `__down_write_trylock' follows non-static
include/asm/rwsem.h:184: warning: `__up_read' declared inline after being called
include/asm/rwsem.h:184: warning: static declaration for `__up_read' follows non-static
include/asm/rwsem.h:208: warning: `__up_write' declared inline after being called
include/asm/rwsem.h:208: warning: static declaration for `__up_write' follows non-static
include/asm/rwsem.h:233: warning: `__downgrade_write' declared inline after being called
include/asm/rwsem.h:233: warning: static declaration for `__downgrade_write' follows non-static
make[3]: *** [drivers/usb/media/sn9c102_core.o] Error 1
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

all other usb drivers get built in alphabetical order, why not these?
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

This involved reworking the usb_serial_debug_data() function too.
Based on a request from SuSE, and numerous user confusions with how
to enable this option.  Now that all usb-serial drivers are using
module_param() it can be set from the boot command line if the drivers
are built into the kernel.
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

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

This single patch contains some updates and cleanups for
the W996[87]CF driver and a new experimental V4L2 driver
for SONiX SN9C10[12] PC Camera Controllers connected to various
image sensors. I have not divided the patch in two logical
sub-patches becouse of two independent changes in one common
file, KConfigure.

More informations about the SN9C10[12] can be found below in the
documentation. The driver is marked as "EXPERIMENTAL", meaning
that there are no known bugs, but further testing is necessary
before considering it stable. This the first driver using the new
SBGGR8 video format, which has been recently added to the mainline
kernel, so there are no available user application at the moment:
this is one more reason why it should be in the kernel now.

Changes in W996[87]CF:
- remove w9968cf_externaldef.h now that ovcamchip.h is in the kernel;
- mark user pointers with __user in a cleaner way to avoid sparse
  warnings;
- use appropriate exclusive wait macro during open();
- replace info(), err(), warn() with dev_info(), dev_err(), dev_warn(),
  pr_debug(), pr_info();
- replace usb_unlink_urb() + wait_for_completion() with usb_kill_urb();
- fix memory offsets for buffers in the chip to be used with generic
  image sensors;
- 'vppmod_load', 'debug', 'specific_debug' and 'simcams' module
  parameters are now writeable by default;
- fix possible race conditions between disconnect() and open();
- add automatic 'ovcamchip' module loading option with 'ovmod_load'
  module parameter;
- get rid of deprecated intermodule communication routines and use the
  correct module registration/unregistration approach;
- remove period at the end of kernel messages;
- fix several typos;
- use MODULE_VERSION() macro;
- other small internal cleanups;
- documentation updates.
Signed-off-by: Luca Risolia <luca.risolia@studio.unibo.it>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

Update CDC Ethernet/RNDIS gadget driver to the latest:

    -	Basics of OTG support: providing the OTG descriptor
	in each configuration (as needed).   No HNP yet.

    -	Stop issuing partial-packet reads.  There's some hardware that
	only counts reads in packets, not bytes, so let's not bother.
	There are still software checks to catch framing gone wild.

    -	Fix a small bug that crept in with a memory leak fix: after
        RNDIS requests, ep0 responses would use the RNDIS completion
	handler even for non-RNDIS requests.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

This patch teaches "gadget zero" enough about OTG to pass simple USBCV
tests, mostly by including OTG descriptors in each configuration.  It
tests and reports OTG status, as reported by the USB controller driver.

It also adds an option to build gadget zero to act as the designated
OTG "HNP Test Device", which exists primarily to trigger HNP.  However,
it won't currently request HNP.

Includes other minor tweaks:  delete a timer on disconnect, reset
the req->zero flag, don't autoresume after disconnect.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

Gadget API updates, including new features:

    -	Adds several new optional calls that can be made to the
	USB peripheral controller:

	    * VBUS session reporting, for use mostly by external
	      transcievers (such as isp1301).  Detection of VBUS
	      power is the first step in enumeration, and usually
	      corresponds to a device being plugged into a hub.

	    * "Soft Connect" feature, wherein the D+ pullup is under
	      gadget driver control.  This is a second step during
	      enumeration, which lets the hub see the new device.
	      (Based on a patch by Alex Sanks <alex@netchip.com>.)

	    * Control over VBUS current draw.  So for example this is
	      what a gadget driver uses during SET_CONFIGURATION to
	      say "it's OK to draw 300 mA from VBUS to recharge".

    -	Basic interfaces to support device-side USB OTG.  Feature
	flags and descriptors are in <linux/usb_ch9.h> already.

	    * Reports whether the device has a Mini-AB port, so
	      that OTG support (desriptors etc) is required.

	    * Reports OTG device feature flags for HNP.  (The OTG
	      spec requires user interfaces to report this stuff.)
	      Say if this is a B-Peripheral or an A-Peripheral.

	    * Says that usb_gadget_wakeup() is how to access SRP,
	      and usb_gadget_disconnect() is how to access HNP.

    -	Minor updates/cleanups to comments (Linux 2.5-->2.6 etc)

Currently there's no support for SRP-only OTG devices.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

Tell gadgetfs about omap_udc.
Add some missing __user annotations.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

This lets the serial gadget work with another controller.

Tell serial about omap_udc.  This driver still needs updating to
use the endpoint autoconfig suppport; like Gadget Zero, it
really shouldn't need _any_ hardware-specific #ifdeffery.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

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

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

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