Fixes a bug in the channel reservation :
If dma resources allocation fails, the channel was not freed.  I fixed
that by marking the channel allocated after the dma resources allocation
succeeded.  Also changed the error return value from ioctl.

Signed-off-by: Philippe De Muyter <phdm at macqel dot be>
Signed-off-by: Dan Dennedy <dan@dennedy.org>
Signed-off-by: Jody McIntyre <scjody@modernduck.com>

I have tested and updated a patch from Randy Dunlap that fixes missing
entries in the modules.ieee1394map file. The patch is against latest SVN
(1234).

The patch adds the following entries for IIDC cameras that would not be
detected otherwise:

video1394            0x0000000c  0x000000  0x000000 0x00a02d     0x000101
video1394            0x0000000c  0x000000  0x000000 0x00a02d     0x000102
raw1394              0x0000000c  0x000000  0x000000 0x00a02d     0x000101
raw1394              0x0000000c  0x000000  0x000000 0x00a02d     0x000102

This is necessary because the IIDC consortium interpreted the 1394
specifications differently. They have been summoned by the 1394TA to
change their numbering policy so that these entries are final and will
not grow forever in number.
Signed-off-by: Jody McIntyre <scjody@modernduck.com>

In trunk/ohci1394.c, duplicate code has slipped in which sets 
max_packet_size to 512 and prints a log notice. See "Serial EEPROM 
Sanity check" further down in ohci_initialize(). Since the latter code 
is more appropriate, the former is deleted by the attached patch.
Signed-off-by: Jody McIntyre <scjody@modernduck.com>

drivers/ieee1394/raw1394.c::raw1394_read() with the added bonus of
silencing this warning:
include/asm/uaccess.h: In function `raw1394_read':
drivers/ieee1394/raw1394.c:446: warning: ignoring return value of `__copy_to_user', declared with attribute warn_unused_result

I've submitted this before, but never got an ACK or NACK, and the patch is
still relevant against latest Linus bk (2.6.10-rc2-bk11 atm).
Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: Jody McIntyre <scjody@modernduck.com>

sw-suspend does not work with our kernel.
khpsbpkt will die because down_interruptible returns -EINTR on suspend.
As a result, hpsb packet delivery will not work anymore after resume.
Signed-off-by: Jody McIntyre <scjody@modernduck.com>

Signed-off-by: Jody McIntyre <scjody@modernduck.com>

sbp2 unit directory parsing (for PowerFile)
Signed-off-by: Jody McIntyre <scjody@modernduck.com>

Fix GCC 3.4 compile error with inline keyword in function prototype.
Signed-off-by: Adrian Bunk <bunk@fs.tum.de>
Signed-off-by: Steve Kinneberg <kberg@linux1394.org>
Signed-off-by: Jody McIntyre <scjody@modernduck.com>

Use wmb() to make sure things get flushed before setting the wakup bit.
Signed-off-by: Ben Collins <bcollins@debian.org>
Submitted-by: Keith Bengston <Keith.Bengston@csiro.au>
Signed-off-by: Jody McIntyre <scjody@modernduck.com>

Fix buffer overflow in csr1212.c.
Signed-off-by: Steve Kinneberg <kberg@linux13294.org>
Signed-off-by: Jody McIntyre <scjody@modernduck.com>

Fix bug where 4 times Extended ROM Leaf size would be read when parsing in csr1212.  Added NULL check for csr1212_rom_cache_malloc return value.
Signed-off-by: Steve Kinneberg <kberg@linux1394.org>
Signed-off-by: Jody McIntyre <scjody@modernduck.com>

Fix bugs generating and parsing ConfigROMs with Extended ROM entries.
Signed-off-by: Steve Kinneberg <kberg@linux1394.org>
Signed-off-by: Jody McIntyre <scjody@modernduck.com>

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

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

Patch from David Vrabel

Use some #define'd constants in the ixp4xx's arch_reset().

Signed-off-by: David Vrabel
Signed-off-by: Russell King

Signed-off-by: Russell King <rmk@arm.linux.org.uk>

Signed-off-by: Russell King <rmk@arm.linux.org.uk>

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

Use netdev_priv() and get rid of the PRIV() macro by using the correct
data element. Also eliminate casts, where type is correct.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

When the skfddi driver was converted to the new PCI netdevice interface,
it never got tested with real hardware. The initialization got broken, this
should fix it.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

Fixes instances where gfar_read() was invoked in debug codewith a value,
rather than a pointer.
Signed-of-by: Andy Fleming <afleming@freescale.com>
Signed-of-by: Kumar Gala <afleming@freescale.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

From: Steven Rostedt <rostedt@goodmis.org>

If the transmit buffer of the e100 overflowed, then the system would hang.
This was caused because the e100 driver would stop the queue, and
netpoll_send_pkt in netpoll.c would then loop forever.  This is because the
e100 net_poll would never start the queue again after the transmits have
completed.

For those that use the e100 and netconsole, all you need to do is a sysreq
't' to lock up the system.
Acked-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

Fixes breakage in getting MAC address on built-in tulip in
alphastation 200 - without delay we are skipping bytes.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

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

This patch adds the Intel ICH7R DID's to the ahci.c SATA AHCI driver
for ICH7R SATA support.
Signed-off-by:  Jason Gaston <Jason.d.gaston@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

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

into silver.ucw.cz:/home/vojtech/bk/dmitry

Signed-off-by: Vojtech Pavlik <vojtech@suse.cz>

       changing HID->event mappings (via EVIOCS*) in the future and make 
       debugging easier now.
Signed-off-by: Vojtech Pavlik <vojtech@suse.cz>

       rebooting.
Signed-off-by: Vojtech Pavlik <vojtech@suse.cz>

       good idea to discard any character other than ACK/NAK during probe
       it causes missing releases and keys getting "stuck" when a command
       issued on enabled device. The effect is easily demonstrated with
       the following command:
           while true; do xset led 3; xset -led 3; done

       With this change extra characters will be discarded only if device
       has not been marked as "enabled" yet.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru> 

into silver.ucw.cz:/home/vojtech/bk/input

looking at ext3_xattr_block_set() [fs/ext3/xattr.c] ...
I see that

                                error = -EDQUOT;
                                if (DQUOT_ALLOC_BLOCK(inode, 1))
                                        goto cleanup;

allocates a quota block, but right after that several
error echecks happen ...

                                if (error)
                                        goto cleanup;

and I don't see any DQUOT_FREE_BLOCK() in the errorpath

cleanup:
        if (ce)
                mb_cache_entry_release(ce);
        brelse(new_bh); 
        if (!(bs->bh && s->base == bs->bh->b_data))
                kfree(s->base);

        return error;

I'd suggest the attached fix.
Acked-by: Jan Kara <jack@suse.cz>
Acked-by: Andreas Gruenbacher <agruen@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

Patch from Nicolas Pitre

This enables audio on Mainstone with the ALSA PXA2xx AC97 driver.

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

Patch from Ben Dooks

All the headers refer to debug-armv.S, when they where split from
debug.S

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

Patch from Ben Dooks

the calls _find_first_zero_bit_be() and _find_next_zero_bit_be()
are missing const from the pointer argument passed in, causing
several build warnings when building an ARM kernel in big-endian
mode.

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

Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>