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

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

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

This patch adds support for calling usb_reset_device() on hubs (other than
root hubs).  It uses some of the new routines added recently by David
Brownell to shorten and simplify the code.  The only place where this is
called is if khubd encounters a serious error with a hub, so I don't
expect it to turn up very often in ordinary use.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

Attached is a patch for cdc-acm out of bounds access.
Signed-off-by: Catalin(ux aka Dino) BOIE <catab@umbrella.ro>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

 This patch add a missing check in the call to bus_register() and
not initialise `result' (which is not necessary).
Signed-off-by: Luiz Capitulino <lcapitulino@conectiva.com.br>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

 This patch removes ugly code from some function in usb/serial/usb-serial.c
which is using a goto statement intead of a simple `return'.

 To be true, I'm not certain if there is a special reason to do that, if so
ignore me. ;)
Signed-off-by: Luiz Capitulino <lcapitulino@conectiva.com.br>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

This patch repairs a mistake I made when adding OTG support to the
file-storage gadget.  All the descriptor entries were bumped up by one,
which caused a problem during initialization.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

this implements a work around for some devices which have correct
extra descriptors, but misplace them.
Signed-Off-By: Oliver Neukum <oliver@neukum.name>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

Actual users of ub quickly found problems, so here's a patch to address
some of them.

#1: An attempt to mount a CF card, pull the plug, then unmount causes a
message "getblk: bad sector size 512" and an oops. This is caused by
trying to do put_disk from disconnect instead of using a reference count.
The sd.c does it this way (it uses kref).

#2: The hald fills /var/log/messages with block device errors. It seems
that it happens because ub allowed opens of known offline devices, and
then partition checking produced those errors. I hope taking code from
sd.c should fix it.

Also I replaced usb_unlink_urb with usb_kill_urb.
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

While we are looking at this driver, here is a way to avoid one full
page of annoying messages at shutdown/module unload.
Signed-off-by: Eric Valette <Eric.Valette@free.fr>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

From: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>

This patch adds pci_disable_device() into usb_hcd_pci_remove().

If the driver decides to stop using the device, it should call
pci_disable_device() to deallocate any IRQ resources, disable PCI
bus-mastering, etc.
Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

SN9C10x driver updates.

Changes: (+ new, - removed, * cleanup, @ bugfix, = sync with kernels)

@ Create correct red,green,blue entries under /sys according to the detected
  bridge
* Add and use defined symbols for I2C slave ids of TAS5110C1B and TAS51130D1B
* Color fixes for PAS202BCB - from its maintainer -
Signed-off-by: Luca Risolia <luca.risolia@studio.unibo.it>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

This patch reintroduces the usb_lock_device_for_reset() routine, which
is specially tailored to meet the needs of drivers that have to reset a
device either during probe() or during normal operations.  It updates a
few drivers that do device resets, to make them use the new routine.  It
also adds a new field to struct usb_interface, to keep track of whether
the interface is in the process of being bound to or unbound from a
driver.  This is necessary, because during binding we know the device is
already locked so we don't want to try to acquire the lock again!

With this patch in place, USB device resets should finally become
reliable.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

This patch reintroduces the USB device locking code we tried out
earlier.  As before, it solves the problem of effectively locking all
the devices while drivers are registered and unregistered by introducing
an rwsem.  Unlike the earlier attempt, this version does not ever try to
acquire a lock re-entrantly.  I trust that will eliminate the races and
hang-ups you observed with the earlier version.  There are also copious
comments explaining exactly how things should work.

The patch interacts slightly with the locktree() code introduced by
David for suspend/resume support.  It doesn't change the functionality
at all; it just updates the routine to follow the new locking rules.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

Please merge, some recent changes made problems
by making init take too long.  This also adds a bit of
support for detecting the funky resume states that
happen with suspend-to-disk (like swsusp, pmdisk).


Refactor controller initialization ... this is most of the patch by volume.

 - A time-critical section now runs with IRQs blocked, rather than being split
   over two separate routines.  (I've recently seen init failures because of
   preemption in the middle of that 2msec timeout, presumably by khubd.)

 - Bus glue for PCI, LH7A404, OMAP, and SA-1100 now shares more init logic;
   that'll help shrink support for upcoming non-PCI patches too.

 - Move the root hub register macros to the header (for debug build issue)

 - More tweaks to the frame clock initialization, including slightly more
   helpful diagnostics on "init err".

Better SWSUSP support.

 - Detects and handles some funky "resume after suspend-to-disk" cases.  These
   need to go through full driver re-init.

 - Restore root hub to CONFIGURED state on resume.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

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

This patch kills the bogus radeonfb_read/write routines. In order to do so,
it adds a new member to fb_info, along with screen_base, which is screen_size,
indicating the mapped area. The default fb_read/write will now use that instead
of fix->smem_len if it is non-0, and radeonfb now sets it to the mapped size
of the framebuffer.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This is a resend of a patch sent in July and that got lost somewhat,
the "VSCR" register wasn't restored properly from the context on
load_up_altivec (typo), please apply the fix:
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

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

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

Signed-off-by: David S. Miller <davem@davemloft.net>

Only send NETDEV_CHANGEADDR notifies for address and broadcast changes.
Notify is also sent out if only one of the 2 changes is successful.
Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: Jamal Hadi Salim <hadi@cyberus.ca>
Signed-off-by: David S. Miller <davem@davemloft.net>

Am travelling, but this passed simple tests here.  If this isn't going
in, the current seqfile stuff should be ripped out; it's a mess.

/proc/net/ip_conntrack was changed over to seq_file.  However,
seq_file isn't a great fit (a linked list which is changing is not a
good candidate for seq file), and the conversion was done badly.

1) Don't do allocation: simply hand the pointer head of the correct chain.
2) Actually output the original tuple.
3) Lock only when actually traversing hash chain.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

With improvements by Francois Romieu and David
S. Miller.
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Jamal Hadi Salim <hadi@cyberus.ca>
Signed-off-by: David S. Miller <davem@davemloft.net>

Noticed by Eric Lemoine.
Signed-off-by: David S. Miller <davem@davemloft.net>

	Appended is a 2nd version that uses nf_reset_debug.

- do not use skb_checksum_help in input path as ipvs can handle
incoming CHECKSUM_HW packets

- do not use skb_checksum_help in forwarding path

- claim that checksum is valid (CHECKSUM_NONE) when entering output
path for out->in packets

- do not reset/destroy the nfct in IP_VS_XMIT, the intention is to
reset the debugging field just to avoid log floods from nf_debug_ip_*
functions, it is known that the ipvs packets traverse other
hooks, eg. LOCAL_IN->LOCAL_OUT. Use nf_reset_debug instead of nf_reset.
Signed-off-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: David S. Miller <davem@davemloft.net>

Old debugging code we no longer need.
Signed-off-by: David S. Miller <davem@davemloft.net>

Noticed by Herbert Xu.
Signed-off-by: David S. Miller <davem@davemloft.net>

This fixes panic in rt6_device_match().

Well, rt->rt6i_idev is always set if it is dynamically allocated.
However, when we hit ip6_null_entry here, its rt6i_idev is NULL.
This patch is minimum fix to avoid the oops for now.
Signed-off-by: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

From: Thomas Gleixner <tglx@linutronix.de>

1. If the fake 5513 id bit is not set by the BIOS we must have the 5518
id in the device table.

2. If the register remapping is not set by the BIOS then the enable bit
check in ide_pci_setup_ports will fail. It's safe to switch to the
remapping mode here. Keeping the not remapped mode would need quite big
changes AFAICS.

Forward ported to 2.6 by me.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>