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

Here is a new version of the patch to usb-serial.c to fix
the unbalanced kref and module get/put in serial_open and
serial_close when there are errors.  This version works
correctly when try_module_get fails and now "rmmod --wait"
works correctly.


* If the low level usb serial open fails, the kref and
  module use counts are decremented once in open.  Before,
  they were mistakenly decremented again in close.

* If try_module_get fails, the module use count is not
  changed.  Before, the module use count was mistakenly
  decremented.  Now "rmmod --wait" works correctly.

* The tty->driver_data pointer is never set to NULL once
  the port is open.  Before there was a small window when
  it was mistakenly set to NULL for an already open port.
Signed-off-by: Al Borchers <alborchers@steinerpoint.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

[PATCH] io_edgeport locking, flow control, and misc fixes

- Updated to version 2.7.

- Added locking to protect the circular buffer, txCredits, rxBytesAvail,
  and read_in_progress.

- With these locking fixes tests running 8 ports at 115200 bps on
  SMP now runs for hours without problems; before these changes this
  test would cause out of memory errors or oopses within minutes.

- Removed the RELEVANT_IFLAG macro which mistakenly filtered out the
  software flow control stty flags.

- Added support for mark and space parity.

- Added a private read_in_progress flag rather than using (urb->status
  == -EINPROGRESS).

- Low latency is now a module parameter, it is on by default.

- Added edge_tty_recv to pass data to the tty flip buffers.

- Cleared the write_urb pointer after freeing it, to prevent oops on
  failed open.

- Cleared the txfifo.fifo pointer after freeing it, to prevent double
  free on failed open.

- Simplified rounding the baud rate divisor.

- Added some error messages.
Signed-off-by: Al Borchers <alborchers@steinerpoint.com>
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>

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>

These EHCI updates go along with usbcore changes to avoid power_state.

 - Reinitialize one more register on resume-after-poweroff; and
   for controllers that need it, each port.

 - Avoid some pointless delays/faults

 - Defer re-enabling IRQS on resume path, to make it work with APM on a
   ThinkPad T40.  (From: Nickolai Zeldovich <nickolai@cs.stanford.edu>)
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

Revert this patch, as a later patch contains it already.
As requested by David Brownell.
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

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

Yeah, the locking is still all fucked up, but at least it's
not _obviously_ wrong anymore.  It still needs to be fixed 
properly one of these days...
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

This adds an unusual devs entry for Yakumo Mega-Image 47 - it suffers
from the residue problem.
Patch originally submitted by Bjoern Paetzel <kolrabi@kolrabi.de>
and I rediff'd it.

From: Bjoern Paetzel <kolrabi@kolrabi.de>
Signed-off-by: Phil Dibowitz <phil@ipom.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

This patch adds an unusual_devs.h entry for the Apple iPod as it
reports one too many sectors. The patch was submitted by
Avi Kivity <avi@argo.co.il> and re-diffed by me.

Greg, please apply.
Signed-off-by: Avi Kivity <avi@argo.co.il>
Signed-off-by: Phil Dibowitz <phil@ipom.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

On Tue, Nov 09, 2004 at 08:42:43AM -0800, Greg KH wrote:
> On Sun, Nov 07, 2004 at 03:20:39PM -0700, David Brownell wrote:
> > On Sunday 07 November 2004 13:30, Adrian Bunk wrote:
> > > The patch below makes some needlessly global USB gadget functions
> > > static.
> >
> > It looks fine except for the one config descriptor utility
> > (just strike those bits from the patch).  Those are exported
> > to support composite devices ... for "multi-function" devices.
>
> Care to send me a patch with the correct parts in it?  :)
>...


USB gadget: make 4 needlessly global functions static.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

SN9C10x driver updates.

The most important change is the addition of the "SN9C10x" vendor-specific
pixel format, which is used by the applications or libraries to get "raw"
compressed data from the SN9C10x controllers. This also means that V4L2 should
be smart enough for the decompression to be handled in userland. You can
consider this patch as a further response to the discussion we had on the lkml
about the submission of the PWC driver including decompression in kernelspace,
which is present in the Alan Cox's tree.

Changes: (+ new, - removed, * cleanup, @ bugfix)

@ Fix VIDIOC_TRY_FMT ioctl
@ Fix SOF/EOF problems with TAS5130D1B image sensor
@ Fix VIDIOC_ENUM_FMT ioctl
* Replace wait_event_interruptible() with wait_event_timeout()
* Use msecs_to_jiffies() for timeouts in jiffies
* Use usb_make_path() on VIDIOC_QUERYCAP for device path in the usb tree
* read() returns buf.bytesused instead of buf.length on success
- Remove brightness control from PAS106B and PAS202BCB, since it has no effect
  on the active pixel area (it's just for window border lines)
+ Implement VIDIOC_G_PARM and VIDIOC_S_PARM ioctl's
+ Add DAC magnitude, DAC sign, green balance and exposure controls for PAS106B
  and PAS202BCB image sensors
+ Add an additional pixel format for compressed video: V4L2_PIX_FMT_SN9C10X
+ VIDIOC_S_JPEGCOMP and VIDIOC_G_JPEGCOMP are used to set or get the current
  compression quality
+ New documentation note in "Notes for V4L2 application developers" paragraph
  about video formats and compressed data.
+ Documentation updates about the new features
Signed-off-by: Luca Risolia <luca.risolia@studio.unibo.it>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

These OHCI updates go along with usbcore changes to avoid power_state
(mostly for sysfs) and leave usbcore handling usb_device state (except
for quick-disconnect on STD resume).

 - detect and ignore a root hub status polling call made during
   suspend without USB_RESUME (it'd act like CardBus eject...)

 - detect and ignore a superfluous root hub resume call made in
   some cases with USB_RESUME

 - use irqsave spinlock calls in timer callback paths

 - don't expect usbcore to understand "disconnect the root hub"

 - avoid some pointless delays/faults

So it should fix a lot of the problems folk have been having with
OHCI in the latest 2.6.10-rc1-bk kernels.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

Makes usbcore handle some suspend scenarios more consistently, especially
when talking with root hubs.

 - Use usb_device->state, not device->power.power_state.  (The driver model
   power_state is still needed for interfaces.)  With USB_SUSPEND=n, there
   are also cases where the HCD_STATE_SUSPENDED needs to be used instead
   of testing for USB_STATE_SUSPENDED.

 - Updates usb_device->state for root hubs during suspend/resume.

 - Fixes a locking bug (extra "up") that got merged recently, affecting
   CONFIG_USB_SUSPEND.

 - Recover one of the "HC died" cases better.

 - Root hub timer updates, handling various suspend transitions more
   consistently:  don't duplicate earlier submit checks, only work
   when hub is configured, address various submit/resume races.

Together, these help hubs work better regardless of whether USB_SUSPEND
has been enabled (that's the only way USB_STATE_SUSPENDED appears), and
whether or not the HCD is marked as suspended (or maybe Alan would
want to call that "half suspended").
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

Updates the PCI glue for HCDs:

 - There's now just one code path to suspend. CONFIG_USB_SUSPEND mostly
   means bypassing the "idle the root hub" part, and it uses the same
   D1/D2 logic when necessary.

 - Though usbcore is moving away from device->power.power_state, it still
   needs to be initialized correctly (else pmcore can get confused).

 - Disable the device on init path failures.

The first two address real bugs, the third was just something I noticed
while fixing the second.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

I've been having some problems with the EHCI driver on my Thinkpad T40,
running 2.6.9 with APM instead of ACPI.  On resume after suspend-to-RAM
the EHCI hardware keeps the interrupt line high, but the EHCI driver is
not clearing the interrupt status register, causing Linux to eventually
disable the interrupt altogether.

The attached patch for ehci-hub.c does the obvious thing: delay enabling
interrupts until hcd->state is set to USB_STATE_RUNNING.

From: Nickolai Zeldovich <nickolai@cs.stanford.edu>
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

This makes the "USB Network Adapter" support into a submenu, shrinking
the main USB menu and simplifying the individual adapter entries.

It also lists more of the devices supported: four more AX8817X products
and (Linux-based) Gumstix.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

Silly #endif placement problem.

"platform_rename_gsi" does not exist unless CONFIG_ACPI_BOOT is defined.

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

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

Patch from Nicolas Pitre

This should be applied on top of patch #2154/1.

This maps the XIP kernel in the same virtual area as used for kernel
modules instead of the previous arbitrary location.  Doing so has the
advantage of having a well defined kernel address not conflicting
with the different definitions for VMALLOC_END, as well as making
modules loadable without any indirect long branch calls.  The work
on XIPable MTD also requires this with code marked __xipram for the
same reason.

This of course reduces the space available for kernel modules from
16MB to either 14MB or 12MB depending on the size of the resulting 
kernel but that shouldn't be a real issue at all, given that the
whole purpose behind XIP is to execute as much stuff from flash, 
which is better achieved by compiling drivers in the kernel directly.

Signed-off-by: Nicolas Pitre 
Signed-off-by: Russell King

Patch from Nicolas Pitre

This patch allows for the kernel to be configured for XIP.
A lot of people are using semi hacked up XIP patches already so
it is a good idea to have a generic and clean implementation 
supporting all ARM targets. The patch isn't too intrusive.

It involves:

- modifying the kernel entry code to map separate .text and .data
  sections in the initial page table, as well as relocating
  .data to ram when needed

- modifying the linker script to account for the different VMA and
  LMA for .data, as well as making sure that .init.data gets
  relocated to ram

- adding the final kernel mapping with a new MT_ROM mem type

- distinguishing between XIP and non-XIP for bootmem and memory
  resource declaration

- and adding proper target handling to Makefiles.

While at it, this also cleans up the kernel boot code a bit
so the kernel can now be compiled for any address in ram,
removing the need for a relation between kernel address and
start of ram.  Also throws in some more comments.

And finally the _text, _etext, _end and similar variables are now
declared extern void instead of extern char, or even extern int.
That allows for operations on their address directly without any
cast, and trying to reference them by mistake would yield an 
error which is a good thing.

Tested both configurations: XIP and non XIP, the later 
producing a kernel for execution from ram just as before.

Signed-off-by: Nicolas Pitre 
Signed-off-by: Russell King

Patch from Ben Dooks

Added symbol export to the file, and cleaned up the
un-necessary include files

Signed-off-by: Ben Dooks 
Signed-off-by: Russell King

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

Make sure kernel reads full size of elf data.  Error out if mmap fails
when mapping any sections of the executable.  Make sure interpreter
string is NULL terminated. 
Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

On Tue, Nov 09, 2004 at 01:38:11PM -0600, Jason.Jorgensen@comtrol.com wrote:
     On Tuesday, November 09, 2004 10:58 AM, Theodore Ts'o <tytso@mit.edu> wrote:
    > I developed the Rocketport device driver under contract of Comtrol,
    > with the understanding that the resulting device driver would be
    > released under the GPL.  So I believe the correct way of resolving the
    > conflicting copyright statements is to delete the following lines.
    > 
    > It would be good to get positive confirmation from Comtrol as well
    > that this is their understanding as well. 
   
     You are absolutely correct. That notice slipped by us and should not be in
     there. 
   
     If someone with access to the mainline source could remove that for us we
     would appreciate it.

Cc: Keith.Hammerbeck@comtrol.com, Steve.Erler@comtrol.com
Acked-by: Jason.Jorgensen@comtrol.com
Signed-off-by: "Theodore Ts'o" <tytso@thunk.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Only set the flag in the cases when the exit state is not either
TASK_DEAD or TASK_ZOMBIE.

(TASK_DEAD or TASK_ZOMBIE will either race or we'll return the 
information, so no need to note them).

I confirmed that this fixes the problem and I also ran some LTP tests
Signed-off-by: Dinakar Guniguntala <dino@in.ibm.com>
Signed-off-by: Sripathi Kodi <sripathik@in.ibm.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

into cantab.net:/home/src/ntfs-2.6-devel

into cantab.net:/home/src/ntfs-2.6-devel

- Cleanup fs/ntfs/aops.c::ntfs_{read,write}page() since we know that a
  resident attribute will be smaller than a page which makes the code
  simpler.  Also make the code more tolerant to concurrent ->truncate.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>

into flatcap.org:/home/flatcap/backup/bk/ntfs-2.6-devel

Patch from Dave Jiang

Converting IOP321 UART to platform device
Remove asm/arch/serial.h dependency

Signed-off-by: Dave Jiang
Signed-off-by: Russell King

Patch from Dave Jiang

Clean up iop3xx timer routines and move to xtime_lock/timer_tick schemes
dependent on patch 2216/1

Signed-off-by: Dave Jiang
Signed-off-by: Russell King

Patch from Ben Dooks

Add a system device for the s3c2440 called s3c2440-core
to allow power management hooks for s3c2440 specific
registers to be added.

Signed-off-by: Ben Dooks 
Signed-off-by: Russell King

Patch from Ben Dooks

This patch does the following:

 - Save S3C2410_DCLKCON over sleep
 - Save all non-SDRAM memory bank config
 - Fix bug in setting PLL before clock divisor
 - Save all IRQ level controlls
 - Restore IRQ masks _after_ configuration restored
 - No debug until core registers restored

This patch also moves the pm save/restore list code
into the header, for other parts of arch/arm/mach-s3c2410
to use. Note, this is not a general invite for external
code to use these functions.

Also applied patch from Dimitry Andric to fix up the
spelling/typos in Documentation/arm/Samsung-S3C24XX/Suspend.txt

Signed-off-by: Ben Dooks 

Signed-off-by: Dimitry Andric 
Signed-off-by: Russell King