14 years agoMerge branches 'topic/fix/hda' and 'topic/fix/misc' into for-linus
Takashi Iwai [Tue, 18 Nov 2008 12:49:39 +0000 (13:49 +0100)]
Merge branches 'topic/fix/hda' and 'topic/fix/misc' into for-linus

14 years agoALSA: hda - Fix resume of GPIO unsol event for STAC/IDT
Takashi Iwai [Tue, 18 Nov 2008 09:55:36 +0000 (10:55 +0100)]
ALSA: hda - Fix resume of GPIO unsol event for STAC/IDT

Use cached write for setting the GPIO unsolicited event mask to be
restored properly at resume.

Signed-off-by: Takashi Iwai <>
14 years agoALSA: hda - Add quirks for HP Pavilion DV models
Takashi Iwai [Tue, 18 Nov 2008 09:48:41 +0000 (10:48 +0100)]
ALSA: hda - Add quirks for HP Pavilion DV models

Added the quirk entries for HP Pavilion DV5 and DV7 with model=hp-m4.

Reference: Novell bnc#445321, bnc#445161

Signed-off-by: Takashi Iwai <>
14 years agoALSA: hda - Fix GPIO initialization in patch_stac92hd71bxx()
Takashi Iwai [Tue, 18 Nov 2008 09:45:15 +0000 (10:45 +0100)]
ALSA: hda - Fix GPIO initialization in patch_stac92hd71bxx()

Fixed the GPIO mask and co initialization in patch_stac92hd71bxx()
so that the gpio_maks for HP_M4 model is set properly.

Signed-off-by: Takashi Iwai <>
14 years agoLinux 2.6.28-rc5 v2.6.28-rc5
Linus Torvalds [Sat, 15 Nov 2008 21:42:56 +0000 (13:42 -0800)]
Linux 2.6.28-rc5

14 years agoFix inotify watch removal/umount races
Al Viro [Sat, 15 Nov 2008 01:15:43 +0000 (01:15 +0000)]
Fix inotify watch removal/umount races

Inotify watch removals suck violently.

To kick the watch out we need (in this order) inode->inotify_mutex and
ih->mutex.  That's fine if we have a hold on inode; however, for all
other cases we need to make damn sure we don't race with umount.  We can
*NOT* just grab a reference to a watch - inotify_unmount_inodes() will
happily sail past it and we'll end with reference to inode potentially
outliving its superblock.

Ideally we just want to grab an active reference to superblock if we
can; that will make sure we won't go into inotify_umount_inodes() until
we are done.  Cleanup is just deactivate_super().

However, that leaves a messy case - what if we *are* racing with
umount() and active references to superblock can't be acquired anymore?
We can bump ->s_count, grab ->s_umount, which will almost certainly wait
until the superblock is shut down and the watch in question is pining
for fjords.  That's fine, but there is a problem - we might have hit the
window between ->s_active getting to 0 / ->s_count - below S_BIAS (i.e.
the moment when superblock is past the point of no return and is heading
for shutdown) and the moment when deactivate_super() acquires

We could just do drop_super() yield() and retry, but that's rather
antisocial and this stuff is luser-triggerable.  OTOH, having grabbed
->s_umount and having found that we'd got there first (i.e.  that
->s_root is non-NULL) we know that we won't race with

So we could grab a reference to watch and do the rest as above, just
with drop_super() instead of deactivate_super(), right? Wrong.  We had
to drop ih->mutex before we could grab ->s_umount.  So the watch
could've been gone already.

That still can be dealt with - we need to save watch->wd, do idr_find()
and compare its result with our pointer.  If they match, we either have
the damn thing still alive or we'd lost not one but two races at once,
the watch had been killed and a new one got created with the same ->wd
at the same address.  That couldn't have happened in inotify_destroy(),
but inotify_rm_wd() could run into that.  Still, "new one got created"
is not a problem - we have every right to kill it or leave it alone,
whatever's more convenient.

So we can use idr_find(...) == watch && watch->inode->i_sb == sb as
"grab it and kill it" check.  If it's been our original watch, we are
fine, if it's a newcomer - nevermind, just pretend that we'd won the
race and kill the fscker anyway; we are safe since we know that its
superblock won't be going away.

And yes, this is far beyond mere "not very pretty"; so's the entire
concept of inotify to start with.

Signed-off-by: Al Viro <>
Acked-by: Greg KH <>
Signed-off-by: Linus Torvalds <>
14 years agoLIS3LV02Dx: remove unused #include <version.h>
Huang Weiyi [Thu, 13 Nov 2008 12:14:17 +0000 (20:14 +0800)]
LIS3LV02Dx: remove unused #include <version.h>

The file(s) below do not use LINUX_VERSION_CODE nor KERNEL_VERSION.

This patch removes the said #include <version.h>.

Signed-off-by: Huang Weiyi <>
Signed-off-by: Linus Torvalds <>
14 years agoMerge branch 'sh/for-2.6.28' of git://
Linus Torvalds [Sat, 15 Nov 2008 20:10:32 +0000 (12:10 -0800)]
Merge branch 'sh/for-2.6.28' of git://git./linux/kernel/git/lethal/sh-2.6

* 'sh/for-2.6.28' of git://
  serial: sh-sci: Reorder the SCxTDR write after the TDxE clear.
  sh: __copy_user function can corrupt the stack in case of exception
  sh: Fixed the TMU0 reload value on resume
  sh: Don't factor in PAGE_OFFSET for valid_phys_addr_range() check.
  sh: early printk port type fix
  i2c: fix i2c-sh_mobile rx underrun
  sh: Provide a sane valid_phys_addr_range() to prevent TLB reset with PMB.
  usb: r8a66597-hcd: fix wrong data access in SuperH on-chip USB
  fix sci type for SH7723
  serial: sh-sci: fix cannot work SH7723 SCIFA
  sh: Handle fixmap TLB eviction more coherently.

14 years agoMerge branch 'doc-subdirs' of git://
Linus Torvalds [Sat, 15 Nov 2008 19:51:03 +0000 (11:51 -0800)]
Merge branch 'doc-subdirs' of git://git./linux/kernel/git/rdunlap/linux-docs

* 'doc-subdirs' of git://
  Create/use more directory structure in the Documentation/ tree.

14 years agoAdd 'pr_fmt()' format modifier to pr_xyz macros.
Martin Schwidefsky [Wed, 12 Nov 2008 20:16:43 +0000 (21:16 +0100)]
Add 'pr_fmt()' format modifier to pr_xyz macros.

A common reason for device drivers to implement their own printk macros
is the lack of a printk prefix with the standard pr_xyz macros.
Introduce a pr_fmt() macro that is applied for every pr_xyz macro to the
format string.

The most common use of the pr_fmt macro would be to add the name of the
device driver to all pr_xyz messages in a source file.

Signed-off-by: Martin Schwidefsky <>
Signed-off-by: Linus Torvalds <>
14 years agoMerge branch 'for-linus' of git://
Linus Torvalds [Sat, 15 Nov 2008 19:39:09 +0000 (11:39 -0800)]
Merge branch 'for-linus' of git://git./linux/kernel/git/ericvh/v9fs

* 'for-linus' of git://
  9p: restrict RDMA usage

14 years agoMerge branch 'for_linus' of git://
Linus Torvalds [Sat, 15 Nov 2008 19:38:41 +0000 (11:38 -0800)]
Merge branch 'for_linus' of git://git./linux/kernel/git/mchehab/linux-2.6

* 'for_linus' of git://
  V4L/DVB (9624): CVE-2008-5033: fix OOPS on tvaudio when controlling bass/treble
  V4L/DVB (9623): tvaudio: Improve debug msg by printing something more human
  V4L/DVB (9622): tvaudio: Improve comments and remove a unneeded prototype
  V4L/DVB (9621): Avoid writing outside shadow.bytes[] array
  V4L/DVB (9620): tvaudio: use a direct reference for chip description
  V4L/DVB (9619): tvaudio: update initial comments
  V4L/DVB (9618): tvaudio: add additional logic to avoid OOPS
  V4L/DVB (9617): tvtime: remove generic_checkmode callback
  V4L/DVB (9616): tvaudio: cleanup - group all callbacks together
  V4L/DVB (9615): tvaudio: instead of using a magic number, use ARRAY_SIZE
  V4L/DVB (9613): tvaudio: fix a memory leak

14 years agoMerge branch 'for-linus' of git://
Linus Torvalds [Sat, 15 Nov 2008 19:38:02 +0000 (11:38 -0800)]
Merge branch 'for-linus' of git://

* 'for-linus' of git://
  [S390] fix s390x_newuname
  [S390] dasd: log sense for fatal errors
  [S390] cpu topology: fix locking
  [S390] cio: Fix refcount after moving devices.
  [S390] ftrace: fix kernel stack backchain walking
  [S390] ftrace: disable tracing on idle psw
  [S390] lockdep: fix compile bug
  [S390] kvm_s390: Fix oops in virtio device detection with "mem="
  [S390] sclp: emit error message if assign storage fails
  [S390] Fix range for add_active_range() in setup_memory()

14 years agoMerge git://
Linus Torvalds [Sat, 15 Nov 2008 19:37:40 +0000 (11:37 -0800)]
Merge git://git./linux/kernel/git/jejb/scsi-rc-fixes-2.6

* git://
  [SCSI] dpt_i2o: fix transferred data length for scsi_set_resid()
  [SCSI] scsi_error regression: Fix idempotent command handling
  [SCSI] zfcp: Fix hexdump data in s390dbf traces
  [SCSI] zfcp: fix erp timeout cleanup for port open requests
  [SCSI] zfcp: Wait for port scan to complete when setting adapter online
  [SCSI] zfcp: Fix cast warning
  [SCSI] zfcp: Fix request list handling in error path
  [SCSI] zfcp: fix mempool usage for status_read requests
  [SCSI] zfcp: fix req_list_locking.
  [SCSI] zfcp: Dont clear reference from SCSI device to unit
  [SCSI] qla2xxx: Update version number to 8.02.01-k9.
  [SCSI] qla2xxx: Return a FAILED status when abort mailbox-command fails.
  [SCSI] qla2xxx: Do not honour max_vports from firmware for 2G ISPs and below.
  [SCSI] qla2xxx: Use pci_disable_rom() to manipulate PCI config space.
  [SCSI] qla2xxx: Correct Atmel flash-part handling.
  [SCSI] megaraid: fix mega_internal_command oops

14 years agoRevert "x86: blacklist DMAR on Intel G31/G33 chipsets"
David Woodhouse [Fri, 14 Nov 2008 13:47:31 +0000 (13:47 +0000)]
Revert "x86: blacklist DMAR on Intel G31/G33 chipsets"

This reverts commit e51af6630848406fc97adbd71443818cdcda297b, which was
wrongly hoovered up and submitted about a month after a better fix had
already been merged.

The better fix is commit cbda1ba898647aeb4ee770b803c922f595e97731
("PCI/iommu: blacklist DMAR on Intel G31/G33 chipsets"), where we do
this blacklisting based on the DMI identification for the offending
motherboard, since sometimes this chipset (or at least a chipset with
the same PCI ID) apparently _does_ actually have an IOMMU.

Signed-off-by: David Woodhouse <>
Signed-off-by: Linus Torvalds <>
14 years agomm: remove unevictable's show_page_path
KOSAKI Motohiro [Fri, 14 Nov 2008 07:25:01 +0000 (16:25 +0900)]
mm: remove unevictable's show_page_path

Hugh Dickins reported show_page_path() is buggy and unsafe because

 - lack dput() against d_find_alias()
 - don't concern vma->vm_mm->owner == NULL
 - lack lock_page()

it was only for debugging, so rather than trying to fix it, just remove
it now.

Reported-by: Hugh Dickins <>
Signed-off-by: Hugh Dickins <>
Signed-off-by: KOSAKI Motohiro <>
CC: Lee Schermerhorn <>
CC: Rik van Riel <>
Signed-off-by: Linus Torvalds <>
14 years agomisc: C2port needs <linux/sched.h>
Geert Uytterhoeven [Fri, 14 Nov 2008 07:54:46 +0000 (08:54 +0100)]
misc: C2port needs <linux/sched.h>

m68k allmodconfig:

| drivers/misc/c2port/core.c: In function 'c2port_reset':
| drivers/misc/c2port/core.c:73: error: dereferencing pointer to incomplete type
| drivers/misc/c2port/core.c: In function 'c2port_strobe_ck':
| drivers/misc/c2port/core.c:91: error: dereferencing pointer to incomplete type

Include <linux/sched.h> to fix it, as m68k's local_irq_enable() needs to know
about struct task_struct.

Signed-off-by: Geert Uytterhoeven <>
Signed-off-by: Linus Torvalds <>
14 years agom68k: Fix off-by-one in m68k_setup_user_interrupt()
Geert Uytterhoeven [Fri, 14 Nov 2008 07:10:19 +0000 (08:10 +0100)]
m68k: Fix off-by-one in m68k_setup_user_interrupt()

commit 69961c375288bdab7604e0bb1c8d22999bb8a347 ("[PATCH] m68k/Atari:
Interrupt updates") added a BUG_ON() with an incorrect upper bound
comparison, which causes an early crash on VME boards, where IRQ_USER is
8, cnt is 192 and NR_IRQS is 200.

Reported-by: Stephen N Chivers <>
Tested-by: Kars de Jong <>
Signed-off-by: Geert Uytterhoeven <>
Signed-off-by: Linus Torvalds <>
14 years agoMerge branch 'upstream-linus' of git://
Linus Torvalds [Sat, 15 Nov 2008 19:33:05 +0000 (11:33 -0800)]
Merge branch 'upstream-linus' of git://git./linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of git://
  libata: improve phantom device detection

14 years agoALSA: hda - Check model type instead of SSID in patch_92hd71bxx()
Takashi Iwai [Sat, 15 Nov 2008 18:28:54 +0000 (19:28 +0100)]
ALSA: hda - Check model type instead of SSID in patch_92hd71bxx()

Check board preset model instead of codec->subsystem_id in
patch_92hd71bxx() so that other hardwares configured via the model
option work like the given model.

Signed-off-by: Takashi Iwai <>
14 years agoMove "exit_robust_list" into mm_release()
Linus Torvalds [Sat, 15 Nov 2008 18:20:36 +0000 (10:20 -0800)]
Move "exit_robust_list" into mm_release()

We don't want to get rid of the futexes just at exit() time, we want to
drop them when doing an execve() too, since that gets rid of the
previous VM image too.

Doing it at mm_release() time means that we automatically always do it
when we disassociate a VM map from the task.

Cc: Andrew Morton <>
Cc: Nick Piggin <>
Cc: Hugh Dickins <>
Cc: Ingo Molnar <>
Cc: Thomas Gleixner <>
Cc: Brad Spengler <>
Cc: Alex Efros <>
Cc: Peter Zijlstra <>
Cc: Oleg Nesterov <>
Signed-off-by: Linus Torvalds <>
14 years agoALSA: sound/pci/pcxhr/pcxhr.c: introduce missing kfree and pci_disable_device
Julia Lawall [Fri, 14 Nov 2008 18:08:18 +0000 (19:08 +0100)]
ALSA: sound/pci/pcxhr/pcxhr.c: introduce missing kfree and pci_disable_device

Error handling code following a kzalloc should free the allocated data.
The error handling code is adjusted to call pci_disable_device(pci); as
well, as done later in the function

The semantic match that finds the problem is as follows:

// <smpl>
@r exists@
local idexpression x;
statement S;
expression E;
identifier f,l;
position p1,p2;
expression *ptr != NULL;

if ((x@p1 = \(kmalloc\|kzalloc\|kcalloc\)(...)) == NULL) S
x@p1 = \(kmalloc\|kzalloc\|kcalloc\)(...);
if (x == NULL) S
<... when != x
     when != if (...) { <+...x...+> }
x->f = E
 return \(0\|<+...x...+>\|ptr\);
 return@p2 ...;

p1 << r.p1;
p2 << r.p2;

print "* file: %s kmalloc %s return %s" % (p1[0].file,p1[0].line,p2[0].line)
// </smpl>

Signed-off-by: Julia Lawall <>
Signed-off-by: Takashi Iwai <>
14 years agoALSA: hda: STAC_VREF_EVENT value change
Matthew Ranostay [Fri, 14 Nov 2008 22:46:22 +0000 (17:46 -0500)]
ALSA: hda: STAC_VREF_EVENT value change

Changed value for STAC_VREF_EVENT from 0x40 to 0x00 because the
unsol response value is only 6-bits width and the former value
was 1<<6 which is an overrun.

Signed-off-by: Matthew Ranostay <>
Signed-off-by: Takashi Iwai <>
14 years ago[SCSI] dpt_i2o: fix transferred data length for scsi_set_resid()
Miquel van Smoorenburg [Tue, 4 Nov 2008 23:09:12 +0000 (00:09 +0100)]
[SCSI] dpt_i2o: fix transferred data length for scsi_set_resid()

dpt_i2o.c::adpt_i2o_to_scsi() reads the value at (reply+5) which
should contain the length in bytes of the transferred data. This
would be correct if reply was a u32 *. However it is a void * here,
so we need to read the value at (reply+20) instead.

The value at (reply+5) is usually 0xff0000, which is apparently
'large enough' and didn't cause any trouble until 2.6.27 where

commit 427e59f09fdba387547106de7bab980b7fff77be
Author: James Bottomley <>
Date:   Sat Mar 8 18:24:17 2008 -0600

    [SCSI] make use of the residue value

caused this to become visible through e.g. iostat -x .

Signed-off-by: Miquel van Smoorenburg <>
Cc: Stable Tree <>
Signed-off-by: James Bottomley <>
14 years agolibata: improve phantom device detection
Tejun Heo [Thu, 13 Nov 2008 01:04:46 +0000 (10:04 +0900)]
libata: improve phantom device detection

Currently libata uses four methods to detect device presence.

1. PHY status if available.
2. TF register R/W test (only promotes presence, never demotes)
3. device signature after reset
4. IDENTIFY failure detection in SFF state machine

Combination of the above works well in most cases but recently there
have been a few reports where a phantom device causes unnecessary
delay during probe.  In both cases, PHY status wasn't available.  In
one case, it passed #2 and #3 and failed IDENTIFY with ATA_ERR which
didn't qualify as #4.  The other failed #2 but as it passed #3 and #4,
it still caused failure.

In both cases, phantom device reported diagnostic failure, so these
cases can be safely worked around by considering any !ATA_DRQ IDENTIFY
failure as NODEV_HINT if diagnostic failure is set.

Signed-off-by: Tejun Heo <>
Signed-off-by: Jeff Garzik <>
14 years ago9p: restrict RDMA usage
Randy Dunlap [Wed, 12 Nov 2008 21:05:17 +0000 (13:05 -0800)]
9p: restrict RDMA usage


Make 9p's RDMA option depend on INET since it uses Infiniband rdma_*
functions and that code depends on INET.  Otherwise 9p can try to
use symbols which don't exist.

ERROR: "rdma_destroy_id" [net/9p/9pnet_rdma.ko] undefined!
ERROR: "rdma_connect" [net/9p/9pnet_rdma.ko] undefined!
ERROR: "rdma_create_id" [net/9p/9pnet_rdma.ko] undefined!
ERROR: "rdma_create_qp" [net/9p/9pnet_rdma.ko] undefined!
ERROR: "rdma_resolve_route" [net/9p/9pnet_rdma.ko] undefined!
ERROR: "rdma_disconnect" [net/9p/9pnet_rdma.ko] undefined!
ERROR: "rdma_resolve_addr" [net/9p/9pnet_rdma.ko] undefined!

I used an if/endif block so that the menu items would remain
presented together.

Also correct an article adjective.

Signed-off-by: Randy Dunlap <>
Signed-off-by: Eric Van Hensbergen <>
14 years agoCreate/use more directory structure in the Documentation/ tree.
Randy Dunlap [Thu, 13 Nov 2008 21:33:24 +0000 (21:33 +0000)]
Create/use more directory structure in the Documentation/ tree.

Create Documentation/blockdev/ sub-directory and populate it.
Populate the Documentation/serial/ sub-directory.
Move MSI-HOWTO.txt to Documentation/PCI/.
Move ioctl-number.txt to Documentation/ioctl/.
Update all relevant 00-INDEX files.
Update all relevant Kconfig files and source files.

Signed-off-by: Randy Dunlap <>
14 years ago[S390] fix s390x_newuname
Martin Schwidefsky [Fri, 14 Nov 2008 17:18:09 +0000 (18:18 +0100)]
[S390] fix s390x_newuname

The uname system call for 64 bit compares current->personality without
masking the upper 16 bits. If e.g. READ_IMPLIES_EXEC is set the result
of a uname system call will always be s390x even if the process uses
the s390 personality.

Signed-off-by: Martin Schwidefsky <>
14 years ago[S390] dasd: log sense for fatal errors
Stefan Haberland [Fri, 14 Nov 2008 17:18:08 +0000 (18:18 +0100)]
[S390] dasd: log sense for fatal errors

The logging of sense data for fatal errors was accidentally removed
during Hyper PAV implementation.

Signed-off-by: Stefan Haberland <>
Signed-off-by: Martin Schwidefsky <>
14 years ago[S390] cpu topology: fix locking
Heiko Carstens [Fri, 14 Nov 2008 17:18:07 +0000 (18:18 +0100)]
[S390] cpu topology: fix locking

cpu_coregroup_map used to grab a mutex on s390 since it was only
called from process context.
Since c7c22e4d5c1fdebfac4dba76de7d0338c2b0d832 "block: add support
for IO CPU affinity" this is not true anymore.
It now also gets called from softirq context.

To prevent possible deadlocks change this in architecture code and
use a spinlock instead of a mutex.

Cc: Jens Axboe <>
Signed-off-by: Heiko Carstens <>
Signed-off-by: Martin Schwidefsky <>
14 years ago[S390] cio: Fix refcount after moving devices.
Cornelia Huck [Fri, 14 Nov 2008 17:18:06 +0000 (18:18 +0100)]
[S390] cio: Fix refcount after moving devices.

In ccw_device_move_to_orphanage(), a replacing ccw_device
is searched via get_{disc,orphaned}_ccwdev_by_dev_id()
which obtain a reference on the returned ccw_device.
This reference must be given up again after the device
has been moved to its new parent.

Signed-off-by: Cornelia Huck <>
Signed-off-by: Martin Schwidefsky <>
14 years ago[S390] ftrace: fix kernel stack backchain walking
Heiko Carstens [Fri, 14 Nov 2008 17:18:05 +0000 (18:18 +0100)]
[S390] ftrace: fix kernel stack backchain walking

With CONFIG_IRQSOFF_TRACER the trace_hardirqs_off() function includes
a call to __builtin_return_address(1). But we calltrace_hardirqs_off()
from early entry code. There we have just a single stack frame.
So this results in a kernel stack backchain walk that would walk beyond
the kernel stack. Following the NULL terminated backchain this results
in a lowcore read access.

To fix this we simply call trace_hardirqs_off_caller() and pass the
current instruction pointer.

Signed-off-by: Heiko Carstens <>
Signed-off-by: Martin Schwidefsky <>
14 years ago[S390] ftrace: disable tracing on idle psw
Heiko Carstens [Fri, 14 Nov 2008 17:18:04 +0000 (18:18 +0100)]
[S390] ftrace: disable tracing on idle psw

Disable tracing on idle psw. Otherwise it would give us huge
preempt off times for idle. Which is rather pointless.

Signed-off-by: Heiko Carstens <>
Signed-off-by: Martin Schwidefsky <>
14 years ago[S390] lockdep: fix compile bug
Heiko Carstens [Fri, 14 Nov 2008 17:18:03 +0000 (18:18 +0100)]
[S390] lockdep: fix compile bug

arch/s390/kernel/built-in.o: In function `cleanup_io_leave_insn':
mem_detect.c:(.text+0x10592): undefined reference to `lockdep_sys_exit'

Signed-off-by: Heiko Carstens <>
Signed-off-by: Martin Schwidefsky <>
14 years ago[S390] kvm_s390: Fix oops in virtio device detection with "mem="
Christian Borntraeger [Fri, 14 Nov 2008 17:18:02 +0000 (18:18 +0100)]
[S390] kvm_s390: Fix oops in virtio device detection with "mem="

The current virtio model on s390 has the descriptor page above the main
memory. The guest virtio detection will oops if the mem= parameter is
used to reduce/change the memory size.
We have to use real_memory_size instead of max_pfn to detect the virtio
descriptor pages.

Signed-off-by: Christian Borntraeger <>
14 years ago[S390] sclp: emit error message if assign storage fails
Heiko Carstens [Fri, 14 Nov 2008 17:18:01 +0000 (18:18 +0100)]
[S390] sclp: emit error message if assign storage fails

Signed-off-by: Heiko Carstens <>
Signed-off-by: Martin Schwidefsky <>
14 years ago[S390] Fix range for add_active_range() in setup_memory()
Gerald Schaefer [Fri, 14 Nov 2008 17:18:00 +0000 (18:18 +0100)]
[S390] Fix range for add_active_range() in setup_memory()

add_active_range() expects start_pfn + size as end_pfn value, i.e. not
the pfn of the last page frame but the one behind that.
We used the pfn of the last page frame so far, which can lead to a
BUG_ON in move_freepages(), when the kernelcore parameter is specified
(page_zone(start_page) != page_zone(end_page)).

Signed-off-by: Gerald Schaefer <>
Signed-off-by: Martin Schwidefsky <>
14 years agoV4L/DVB (9624): CVE-2008-5033: fix OOPS on tvaudio when controlling bass/treble
Mauro Carvalho Chehab [Fri, 14 Nov 2008 13:46:59 +0000 (10:46 -0300)]
V4L/DVB (9624): CVE-2008-5033: fix OOPS on tvaudio when controlling bass/treble

This bug were supposed to be fixed by 5ba2f67afb02c5302b2898949ed6fc3b3d37dcf1,
where a call to NULL happens.

Not all tvaudio chips allow controlling bass/treble. So, the driver
has a table with a flag to indicate if the chip does support it.

Unfortunately, the handling of this logic were broken for a very long
time (probably since the first module version). Due to that, an OOPS
were generated for devices that don't support bass/treble.

This were the resulting OOPS message before the patch, with debug messages

tvaudio' 1-005b: VIDIOC_S_CTRL
BUG: unable to handle kernel NULL pointer dereference at 00000000
IP: [<00000000>]
*pde = 22fda067 *pte = 00000000
Oops: 0000 [#1] SMP
Modules linked in: snd_hda_intel snd_seq_dummy snd_seq_oss snd_seq_midi_event snd_seq snd_seq_device
snd_pcm_oss snd_mixer_oss snd_pcm snd_timer snd_hwdep snd soundcore tuner_simple tuner_types tea5767 tuner
tvaudio bttv bridgebnep rfcomm l2cap bluetooth it87 hwmon_vid hwmon fuse sunrpc ipt_REJECT
nf_conntrack_ipv4 iptable_filter ip_tables ip6t_REJECT xt_tcpudp nf_conntrack_ipv6 xt_state nf_conntrack
ip6table_filter ip6_tables x_tables ipv6 dm_mirrordm_multipath dm_mod configfs videodev v4l1_compat
ir_common 8139cp compat_ioctl32 v4l2_common 8139too videobuf_dma_sg videobuf_core mii btcx_risc tveeprom
i915 button snd_page_alloc serio_raw drm pcspkr i2c_algo_bit i2c_i801 i2c_core iTCO_wdt
iTCO_vendor_support sr_mod cdrom sg ata_generic pata_acpi ata_piix libata sd_mod scsi_mod ext3 jbdmbcache
uhci_hcd ohci_hcd ehci_hcd [last unloaded: soundcore]

Pid: 15413, comm: qv4l2 Not tainted ( #1)
EIP: 0060:[<00000000>] EFLAGS: 00210246 CPU: 0
EIP is at 0x0
EAX: 00008000 EBX: ebd21600 ECX: e2fd9ec4 EDX: 00200046
ESI: f8c0f0c4 EDI: f8c0f0c4 EBP: e2fd9d50 ESP: e2fd9d2c
 DS: 007b ES: 007b FS: 00d8 GS: 0033 SS: 0068
Process qv4l2 (pid: 15413, ti=e2fd9000 task=ebe44000 task.ti=e2fd9000)
Stack: f8c0c6ae e2ff2a00 00000d00 e2fd9ec4 ebc4e000 e2fd9d5c f8c0c448 00000000
       f899c12a e2fd9d5c f899c154 e2fd9d68 e2fd9d80 c0560185 e2fd9d88 f8f3e1d8
       f8f3e1dc ebc4e034 f8f3e18c e2fd9ec4 00000000 e2fd9d90 f899c286 c008561c
Call Trace:
 [<f8c0c6ae>] ? chip_command+0x266/0x4b6 [tvaudio]
 [<f8c0c448>] ? chip_command+0x0/0x4b6 [tvaudio]
 [<f899c12a>] ? i2c_cmd+0x0/0x2f [i2c_core]
 [<f899c154>] ? i2c_cmd+0x2a/0x2f [i2c_core]
 [<c0560185>] ? device_for_each_child+0x21/0x49
 [<f899c286>] ? i2c_clients_command+0x1c/0x1e [i2c_core]
 [<f8f283d8>] ? bttv_call_i2c_clients+0x14/0x16 [bttv]
 [<f8f23601>] ? bttv_s_ctrl+0x1bc/0x313 [bttv]
 [<f8f23445>] ? bttv_s_ctrl+0x0/0x313 [bttv]
 [<f8b6096d>] ? __video_do_ioctl+0x1f84/0x3726 [videodev]
 [<c05abb4e>] ? sock_aio_write+0x100/0x10d
 [<c041b23e>] ? kmap_atomic_prot+0x1dd/0x1df
 [<c043a0c9>] ? enqueue_hrtimer+0xc2/0xcd
 [<c04f4fa4>] ? copy_from_user+0x39/0x121
 [<f8b622b9>] ? __video_ioctl2+0x1aa/0x24a [videodev]
 [<c04054fd>] ? do_notify_resume+0x768/0x795
 [<c043c0f7>] ? getnstimeofday+0x34/0xd1
 [<c0437b77>] ? autoremove_wake_function+0x0/0x33
 [<f8b62368>] ? video_ioctl2+0xf/0x13 [videodev]
 [<c048c6f0>] ? vfs_ioctl+0x50/0x69
 [<c048c942>] ? do_vfs_ioctl+0x239/0x24c
 [<c048c995>] ? sys_ioctl+0x40/0x5b
 [<c0405bf2>] ? syscall_call+0x7/0xb
 [<c0620000>] ? cpuid4_cache_sysfs_exit+0x3d/0x69
Code:  Bad EIP value.
EIP: [<00000000>] 0x0 SS:ESP 0068:e2fd9d2c

Signed-off-by: Mauro Carvalho Chehab <>
14 years agoV4L/DVB (9623): tvaudio: Improve debug msg by printing something more human
Mauro Carvalho Chehab [Thu, 13 Nov 2008 21:12:43 +0000 (18:12 -0300)]
V4L/DVB (9623): tvaudio: Improve debug msg by printing something more human

Before the patch, the used ioctl were printed as an hexadecimal code,
hard to be understand without consulting the way _IO macros work.
Instead, use the V4L default handler for printing such errors into a way
that would be easier to understand.

Signed-off-by: Mauro Carvalho Chehab <>
14 years agoV4L/DVB (9622): tvaudio: Improve comments and remove a unneeded prototype
Mauro Carvalho Chehab [Thu, 13 Nov 2008 20:25:04 +0000 (17:25 -0300)]
V4L/DVB (9622): tvaudio: Improve comments and remove a unneeded prototype

Some comments are not clear enough. Improve it to allow a better
understanding of the driver behavior.

While there, remove an unneeded struct prototype.

Signed-off-by: Mauro Carvalho Chehab <>
14 years agoV4L/DVB (9621): Avoid writing outside shadow.bytes[] array
Mauro Carvalho Chehab [Thu, 13 Nov 2008 20:03:28 +0000 (17:03 -0300)]
V4L/DVB (9621): Avoid writing outside shadow.bytes[] array

There were no check about the limits of shadow.bytes array. This offers
a risk of writing values outside the limits, overriding other data

Signed-off-by: Mauro Carvalho Chehab <>
14 years agoV4L/DVB (9620): tvaudio: use a direct reference for chip description
Mauro Carvalho Chehab [Thu, 13 Nov 2008 19:22:53 +0000 (16:22 -0300)]
V4L/DVB (9620): tvaudio: use a direct reference for chip description

Instead of storing the pointer for the proper entry at chip description
table, the driver were storing an indirect reference, by using an index.
Better to reference directly the data.

Signed-off-by: Mauro Carvalho Chehab <>
14 years agoV4L/DVB (9619): tvaudio: update initial comments
Mauro Carvalho Chehab [Thu, 13 Nov 2008 17:07:54 +0000 (14:07 -0300)]
V4L/DVB (9619): tvaudio: update initial comments

A driver used on several bttv boards since 2000 is not experimental
anymore ;) Remove it from the comments.

While there, update copyrights addind a quick note about the "recent"
updates since 2005.

Signed-off-by: Mauro Carvalho Chehab <>
14 years agoV4L/DVB (9618): tvaudio: add additional logic to avoid OOPS
Mauro Carvalho Chehab [Thu, 13 Nov 2008 17:01:15 +0000 (14:01 -0300)]
V4L/DVB (9618): tvaudio: add additional logic to avoid OOPS

This patch checks for volume, bass, treble, set mode and get mode
callbacks before actually enabling the code that would use them.

Instead of aborting the driver for load, this patch will allow it to
load with a reduced number of functionatities.

This prevents OOPS if some board entry is missing a needed callback.

Signed-off-by: Mauro Carvalho Chehab <>
14 years agoV4L/DVB (9617): tvtime: remove generic_checkmode callback
Mauro Carvalho Chehab [Thu, 13 Nov 2008 16:55:39 +0000 (13:55 -0300)]
V4L/DVB (9617): tvtime: remove generic_checkmode callback

generic_checkmode() were called, via a callback, for some tvaudio chips.
There's just one callback code used on all those boards. So, it makes no
sense on keeping this as a callback.

Since there were some OOPS reported on tvaudio on, this
patch removes this callback, adding the code at the only place were it
is called: inside chip_tread. A flag were added to indicate the need for
a kernel thread to set stereo mode on cards that needs it.

Using this more direct approach simplifies the code, making it more
robust against human errors.

Signed-off-by: Mauro Carvalho Chehab <>
14 years agoV4L/DVB (9616): tvaudio: cleanup - group all callbacks together
Mauro Carvalho Chehab [Thu, 13 Nov 2008 16:14:15 +0000 (13:14 -0300)]
V4L/DVB (9616): tvaudio: cleanup - group all callbacks together

Signed-off-by: Mauro Carvalho Chehab <>
14 years agoV4L/DVB (9615): tvaudio: instead of using a magic number, use ARRAY_SIZE
Mauro Carvalho Chehab [Thu, 13 Nov 2008 16:10:11 +0000 (13:10 -0300)]
V4L/DVB (9615): tvaudio: instead of using a magic number, use ARRAY_SIZE

Also, the default standard is the first one. So, fix the comment at the

Signed-off-by: Mauro Carvalho Chehab <>
14 years agoV4L/DVB (9613): tvaudio: fix a memory leak
Mauro Carvalho Chehab [Thu, 13 Nov 2008 16:06:33 +0000 (13:06 -0300)]
V4L/DVB (9613): tvaudio: fix a memory leak

Signed-off-by: Mauro Carvalho Chehab <>
14 years agoMerge git://
Linus Torvalds [Thu, 13 Nov 2008 23:55:07 +0000 (15:55 -0800)]
Merge git://git./linux/kernel/git/gregkh/usb-2.6

* git:// (25 commits)
  USB: net: asix: add support for Cables-to-Go USB Ethernet adapter
  USB: gadget: cdc-acm deadlock fix
  USB: EHCI: fix divide-by-zero bug
  USB: EHCI: fix handling of dead controllers
  usb: r8a66597-hcd: fix wrong data access in SuperH on-chip USB
  ub: stub pre_reset and post_reset to fix oops
  USB: SISUSB2VGA driver: add 0x0711, 0x0903
  usb: unusual devs patch for Nokia 7610 Supernova
  USB: remove optional bus bindings in isp1760, fixing runtime warning
  + usb-serial-cp2101-add-enfora-gsm2228.patch added to -mm tree
  USB: storage: adjust comment in Kconfig
  USB: Fix PS3 USB shutdown problems
  USB: unusual_devs entry for Argosy USB mass-storage interface
  USB: cdc-acm.c: fix recursive lock in acm_start_wb error path
  USB: CP2101 Add device ID for AMB2560
  USB: mention URB_FREE_BUFFER in usb_free_urb documentation
  USB: Add YISO u893 usb modem vendor and product IDs to option driver
  usb: musb: fix BULK request on different available endpoints
  usb: musb: fix debug global variable name
  usb: musb: Removes compilation warning in gadget mode

14 years agoMerge git://
Linus Torvalds [Thu, 13 Nov 2008 23:53:30 +0000 (15:53 -0800)]
Merge git://git./linux/kernel/git/agk/linux-2.6-dm

* git://
  dm: avoid destroying table in dm_any_congested
  dm: move pending queue wake_up end_io_acct
  dm mpath: warn if args ignored
  dm mpath: avoid attempting to activate null path
  dm stripe: fix init failure
  dm raid1: flush workqueue before destruction

14 years agodm: avoid destroying table in dm_any_congested
Chandra Seetharaman [Thu, 13 Nov 2008 23:39:14 +0000 (23:39 +0000)]
dm: avoid destroying table in dm_any_congested

dm_any_congested() just checks for the DMF_BLOCK_IO and has no
code to make sure that suspend waits for dm_any_congested() to
complete.  This patch adds such a check.

Without it, a race can occur with dm_table_put() attempting to
destroying the table in the wrong thread, the one running
dm_any_congested() which is meant to be quick and return

Two examples of problems:
1. Sleeping functions called from congested code, the caller
   of which holds a spin lock.
2. An ABBA deadlock between pdflush and multipathd. The two locks
   in contention are inode lock and kernel lock.

Signed-off-by: Chandra Seetharaman <>
Signed-off-by: Mikulas Patocka <>
Signed-off-by: Alasdair G Kergon <>
14 years agodm: move pending queue wake_up end_io_acct
Mikulas Patocka [Thu, 13 Nov 2008 23:39:10 +0000 (23:39 +0000)]
dm: move pending queue wake_up end_io_acct

This doesn't fix any bug, just moves wake_up immediately after decrementing
md->pending, for better code readability.

It must be clear to anyone manipulating md->pending to wake up
the queue if md->pending reaches zero, so move the wakeup as close to
the decrementing as possible.

Signed-off-by: Mikulas Patocka <>
Signed-off-by: Alasdair G Kergon <>
14 years agodm mpath: warn if args ignored
Chandra Seetharaman [Thu, 13 Nov 2008 23:39:06 +0000 (23:39 +0000)]
dm mpath: warn if args ignored

Currently dm ignores the parameters provided to hardware handlers
without providing any notifications to the user.

This patch just prints a warning message so that the user knows that
the arguments are ignored.

Signed-off-by: Chandra Seetharaman <>
Signed-off-by: Alasdair G Kergon <>
14 years agodm mpath: avoid attempting to activate null path
Chandra Seetharaman [Thu, 13 Nov 2008 23:39:00 +0000 (23:39 +0000)]
dm mpath: avoid attempting to activate null path

Path activation code is called even when the pgpath is NULL. This could
lead to a panic in activate_path(). Such a panic is seen in -rt kernel.

This problem has been there before the pg_init() was moved to a

Signed-off-by: Chandra Seetharaman <>
Signed-off-by: Alasdair G Kergon <>
14 years agodm stripe: fix init failure
Heinz Mauelshagen [Thu, 13 Nov 2008 23:38:56 +0000 (23:38 +0000)]
dm stripe: fix init failure

Don't proceed if dm_stripe_init() fails to register itself as a dm target.

Signed-off-by: Heinz Mauelshagen <>
Signed-off-by: Alasdair G Kergon <>
14 years agodm raid1: flush workqueue before destruction
Mikulas Patocka [Thu, 13 Nov 2008 23:38:52 +0000 (23:38 +0000)]
dm raid1: flush workqueue before destruction

We queue work on keventd queue --- so this queue must be flushed in the
destructor. Otherwise, keventd could access mirror_set after it was freed.

Signed-off-by: Mikulas Patocka <>
Signed-off-by: Alasdair G Kergon <>
14 years agoUSB: net: asix: add support for Cables-to-Go USB Ethernet adapter
Jason Cooper [Tue, 11 Nov 2008 18:02:53 +0000 (13:02 -0500)]
USB: net: asix: add support for Cables-to-Go USB Ethernet adapter

Add support to drivers/net/usb/asix.c for the Cables-to-Go "USB 2.0 to
10/100 Ethernet Adapter". USB id 0b95:772a.

Signed-off-by: Jason Cooper <>
Signed-off-by: Greg Kroah-Hartman <>
14 years agoUSB: gadget: cdc-acm deadlock fix
David Brownell [Wed, 12 Nov 2008 19:35:13 +0000 (11:35 -0800)]
USB: gadget: cdc-acm deadlock fix

This fixes a deadlock appearing with some USB peripheral drivers
when running CDC ACM gadget code.

The newish (2.6.27) CDC ACM event notification mechanism sends
messages (IN to the host) which are short enough to fit in most
FIFOs.  That means that with some peripheral controller drivers
(evidently not the ones used to verify the notification code!!)
the completion callback can be issued before queue() returns.

The deadlock would come because the completion callback and the
event-issuing code shared a spinlock.  Fix is trivial:  drop
that lock while queueing the message.

Signed-off-by: David Brownell <>
Cc: stable <>
Signed-off-by: Greg Kroah-Hartman <>
14 years agoUSB: EHCI: fix divide-by-zero bug
Alan Stern [Wed, 12 Nov 2008 22:02:57 +0000 (17:02 -0500)]
USB: EHCI: fix divide-by-zero bug

This patch (as1164) fixes a bug in the EHCI scheduler.  The interval
value it uses is already in linear format, not logarithmically coded.
The existing code can sometimes crash the system by trying to divide
by zero.

Signed-off-by: Alan Stern <>
Cc: David Brownell <>
Cc: Stable <>
Signed-off-by: Greg Kroah-Hartman <>
14 years agoUSB: EHCI: fix handling of dead controllers
Alan Stern [Wed, 12 Nov 2008 22:04:53 +0000 (17:04 -0500)]
USB: EHCI: fix handling of dead controllers

This patch (as1165) makes a few small changes in the logic used by
ehci-hcd when it encounters a controller error:

Instead of printing out the masked status, it prints the
original status as read directly from the hardware.

It doesn't check for the STS_HALT status bit before taking
action.  The mere fact that the STS_FATAL bit is set means
that something bad has happened and the controller needs to
be reset.  With the old code this test could never succeed
because the STS_HALT bit was masked out from the status.

I anticipate that this will prevent the occasional "irq X: nobody cared"
problem people encounter when their EHCI controllers die.

Signed-off-by: Alan Stern <>
Cc: David Brownell <>
Cc: stable <>
Signed-off-by: Greg Kroah-Hartman <>
14 years agousb: r8a66597-hcd: fix wrong data access in SuperH on-chip USB
Yoshihiro Shimoda [Tue, 11 Nov 2008 07:47:21 +0000 (16:47 +0900)]
usb: r8a66597-hcd: fix wrong data access in SuperH on-chip USB

When I used SuperH on-chip USB, there was the problem that accessed
r8a66597_root_hub which was not allocated.

Signed-off-by: Yoshihiro Shimoda <>
Signed-off-by: Greg Kroah-Hartman <>
14 years agoub: stub pre_reset and post_reset to fix oops
Pete Zaitcev [Tue, 11 Nov 2008 04:11:11 +0000 (21:11 -0700)]
ub: stub pre_reset and post_reset to fix oops

Due to recent changes to usb_reset_device, the following hang occurs:

events/0      D 0000000000000000     0     6      2
 ffff880037477cc0 0000000000000046 ffff880037477c50 ffffffff80237434
 ffffffff80574c80 00000001000a015c 0000000000000286 ffff8800374757d0
 ffff88002a31c860 ffff880037475a00 0000000036779140 ffff880037475a00
Call Trace:
 [<ffffffff80237434>] try_to_del_timer_sync+0x52/0x5b
 [<ffffffff8026f86c>] dma_pool_free+0x1a7/0x1ec
 [<ffffffffa02a928a>] ub_disconnect+0x8e/0x1ad [ub]
 [<ffffffff802407c9>] autoremove_wake_function+0x0/0x2e
 [<ffffffff80378959>] usb_unbind_interface+0x5c/0xb7
 [<ffffffff8036ab70>] __device_release_driver+0x95/0xbd
 [<ffffffff8036ac70>] device_release_driver+0x21/0x2d
 [<ffffffff803789f8>] usb_driver_release_interface+0x44/0x83
 [<ffffffff80378ab9>] usb_forced_unbind_intf+0x17/0x1d
 [<ffffffff80371ba4>] usb_reset_device+0x7d/0x114
 [<ffffffffa02aaffd>] ub_reset_task+0x0/0x293 [ub]
 [<ffffffffa02ab1c1>] ub_reset_task+0x1c4/0x293 [ub]
 [<ffffffff8033dd1e>] flush_to_ldisc+0x0/0x1cd
 [<ffffffffa02aaffd>] ub_reset_task+0x0/0x293 [ub]
 [<ffffffff8023d302>] run_workqueue+0x87/0x114
 [<ffffffff8023d467>] worker_thread+0xd8/0xe7
 [<ffffffff802407c9>] autoremove_wake_function+0x0/0x2e
 [<ffffffff8023d38f>] worker_thread+0x0/0xe7
 [<ffffffff802404c1>] kthread+0x47/0x73
 [<ffffffff8022c8dd>] schedule_tail+0x27/0x60
 [<ffffffff8020c249>] child_rip+0xa/0x11
 [<ffffffff8024047a>] kthread+0x0/0x73
 [<ffffffff8020c23f>] child_rip+0x0/0x11

This is because usb_reset_device now unbinds, and that calls disconnect,
which in case of ub waits until the reset completes... which deadlocks.
Worse, this deadlocks keventd and this takes whole box down.

I'm going to fix this properly later, but let's unbreak the driver
quickly for non-composite devices at least.

Signed-off-by: Pete Zaitcev <>
Cc: Alan Stern <>
Signed-off-by: Greg Kroah-Hartman <>
14 years agoUSB: SISUSB2VGA driver: add 0x0711, 0x0903
Albert Comerma [Tue, 4 Nov 2008 18:44:01 +0000 (10:44 -0800)]
USB: SISUSB2VGA driver: add 0x0711, 0x0903

Signed-off-by: Albert Comerma <>
Cc: Alan Cox <>
Cc: David Brownell <>
Cc: Mauro Carvalho Chehab <>
Signed-off-by: Andrew Morton <>
Signed-off-by: Greg Kroah-Hartman <>
14 years agousb: unusual devs patch for Nokia 7610 Supernova
Ricky Wong [Tue, 4 Nov 2008 11:13:45 +0000 (19:13 +0800)]
usb: unusual devs patch for Nokia 7610 Supernova

Additional sectors were reported by the Nokia 7610 Supernova phone in
usb storage mode. The following patch rectifies the aforementioned

Signed-off-by: Ricky Wong Yung Fei <>
Signed-off-by: Greg Kroah-Hartman <>
14 years agoUSB: remove optional bus bindings in isp1760, fixing runtime warning
Sebastian Andrzej Siewior [Sun, 2 Nov 2008 14:25:42 +0000 (15:25 +0100)]
USB: remove optional bus bindings in isp1760, fixing runtime warning

Roland Reported the following:
| kmem_cache_create: duplicate cache isp1760_qtd
| Pid: 461, comm: modprobe Tainted: G        W  2.6.28-rc2-git3-default #4
| Call Trace:
|  [<c017540e>] kmem_cache_create+0xc9/0x3a3
|  [<c0159a8d>] free_pages_bulk+0x16c/0x1c9
|  [<f165c05f>] isp1760_init+0x0/0xb [isp1760]
|  [<f165c018>] init_kmem_once+0x18/0x5f [isp1760]
|  [<f165c064>] isp1760_init+0x5/0xb [isp1760]
|  [<c010113d>] _stext+0x4d/0x148
|  [<c0142936>] load_module+0x12cd/0x142e
|  [<c01743c4>] kmem_cache_destroy+0x0/0xd7
|  [<c0142b1e>] sys_init_module+0x87/0x176
|  [<c01039eb>] sysenter_do_call+0x12/0x2f

The reason, is that ret is initialized with ENODEV instead of 0 _or_
the kmem cache is not freed in error case with no bus binding.

The difference between OF+PCI and OF only is
| 15148     804      32   15984    3e70 isp1760-of-pci.o
| 13748     676       8   14432    3860 isp1760-of.o

about 1.5 KiB.

Until there is a checkbox where the user *must* select atleast one item,
and may select multiple entries I don't make it selectable anymore.
Having a driver which can't be used under any circumstances is broken
anyway and I've seen distros shipping it that way.

Reported-by: Roland Kletzing <>
Signed-off-by: Sebastian Andrzej Siewior <>a
Cc: stable <>
Signed-off-by: Greg Kroah-Hartman <>
14 years ago+ usb-serial-cp2101-add-enfora-gsm2228.patch added to -mm tree
Damir N Abdullin [Thu, 30 Oct 2008 20:52:38 +0000 (13:52 -0700)]
+ usb-serial-cp2101-add-enfora-gsm2228.patch added to -mm tree

Enfora GSM2228 based on Cygnal Integrated Products chip uses the same
cp2101 driver.

Signed-off-by: Damir N Abdullin <>
Signed-off-by: Andrew Morton <>
Signed-off-by: Greg Kroah-Hartman <>
14 years agoUSB: storage: adjust comment in Kconfig
Paul Bolle [Thu, 30 Oct 2008 15:42:43 +0000 (08:42 -0700)]
USB: storage: adjust comment in Kconfig

Since commit 65934a9 ("Make USB storage depend on SCSI rather than selecting
it [try #6]") the comment at the top of drivers/usb/storage/Kconfig is
incorrect. Adjust it to the current situation.

Signed-off-by: Paul Bolle <>
Signed-off-by: Matthew Dharm <>
Signed-off-by: Greg Kroah-Hartman <>
14 years agoUSB: Fix PS3 USB shutdown problems
Geoff Levand [Fri, 31 Oct 2008 20:52:54 +0000 (13:52 -0700)]
USB: Fix PS3 USB shutdown problems

Add ehci_shutdown() or ohci_shutdown() calls to the USB
PS3 bus glue.  ehci_shutdown() and ohci_shutdown() do some
controller specific cleanups not done by usb_remove_hcd().

Fixes errors on shutdown or reboot similar to these:

  ps3-ehci-driver sb_07: HC died; cleaning up
  irq 51: nobody cared (try booting with the "irqpoll" option)

Related bugzilla reports:

Signed-off-by: Geoff Levand <>
Cc: stable <>
Signed-off-by: Greg Kroah-Hartman <>
14 years agoUSB: unusual_devs entry for Argosy USB mass-storage interface
Alan Stern [Tue, 4 Nov 2008 16:33:35 +0000 (11:33 -0500)]
USB: unusual_devs entry for Argosy USB mass-storage interface

This patch (as1162) adds an unusual_devs entry for Argosy's USB-IDE
interface.  This fixes Bugzilla #11843.

Signed-off-by: Alan Stern <>
Tested-by: Luciano Rocha <>
Cc: stable <>
Signed-off-by: Greg Kroah-Hartman <>
14 years agoUSB: cdc-acm.c: fix recursive lock in acm_start_wb error path
Brandon Philips [Thu, 6 Nov 2008 19:19:11 +0000 (11:19 -0800)]
USB: cdc-acm.c: fix recursive lock in acm_start_wb error path

Fixes an obvious bug in cdc-acm by avoiding a recursive lock on
acm_start_wb()'s error path. Should apply towards 2.6.27 stable and

[ INFO: possible recursive locking detected ]
2.6.27-2-pae #109
python/31449 is trying to acquire lock:
 (&acm->write_lock){++..}, at: [<f89a0348>] acm_start_wb+0x5c/0x7b [cdc_acm]

but task is already holding lock:
 (&acm->write_lock){++..}, at: [<f89a04fb>] acm_tty_write+0xe1/0x167 [cdc_acm]

other info that might help us debug this:
2 locks held by python/31449:
 #0:  (&tty->atomic_write_lock){--..}, at: [<c0260fae>] tty_write_lock+0x14/0x3b
 #1:  (&acm->write_lock){++..}, at: [<f89a04fb>] acm_tty_write+0xe1/0x167 [cdc_acm]

stack backtrace:
Pid: 31449, comm: python Not tainted 2.6.27-2-pae #109
 [<c030f42f>] ? printk+0xf/0x18
 [<c0149f33>] __lock_acquire+0xc7b/0x1316
 [<c014a63e>] lock_acquire+0x70/0x97
 [<f89a0348>] ? acm_start_wb+0x5c/0x7b [cdc_acm]
 [<c0312109>] _spin_lock_irqsave+0x37/0x47
 [<f89a0348>] ? acm_start_wb+0x5c/0x7b [cdc_acm]
 [<f89a0348>] acm_start_wb+0x5c/0x7b [cdc_acm]
 [<f89a055d>] acm_tty_write+0x143/0x167 [cdc_acm]
 [<c0262a98>] write_chan+0x1cd/0x297
 [<c012527e>] ? default_wake_function+0x0/0xd
 [<c026111e>] tty_write+0x149/0x1b9
 [<c02628cb>] ? write_chan+0x0/0x297
 [<c01912c5>] ? rw_verify_area+0x76/0x98
 [<c0260fd5>] ? tty_write+0x0/0x1b9
 [<c01919ba>] vfs_write+0x8c/0x136
 [<c0191afd>] sys_write+0x3b/0x60
 [<c0103beb>] sysenter_do_call+0x12/0x3f

Signed-off-by: Brandon Philips <>
Cc: Oliver Neukum <>
Cc: stable <>
Signed-off-by: Greg Kroah-Hartman <>
14 years agoUSB: CP2101 Add device ID for AMB2560
Craig Shelley [Sun, 9 Nov 2008 20:17:54 +0000 (20:17 +0000)]
USB: CP2101 Add device ID for AMB2560

This patch adds the device vendor and product IDs for Amber Wireless AMB2560

Signed-off-by: Craig Shelley <>
Signed-off-by: Greg Kroah-Hartman <>
14 years agoUSB: mention URB_FREE_BUFFER in usb_free_urb documentation
Rabin Vincent [Sun, 9 Nov 2008 06:10:30 +0000 (11:40 +0530)]
USB: mention URB_FREE_BUFFER in usb_free_urb documentation

The usb_free_urb comment says that the transfer buffer will not be
freed, but this is not the case when URB_FREE_BUFFER is set.

Signed-off-by: Rabin Vincent <>
Acked-by: Marcel Holtmann <>
Signed-off-by: Greg Kroah-Hartman <>
14 years agoUSB: Add YISO u893 usb modem vendor and product IDs to option driver
Leslie Watter [Wed, 12 Nov 2008 17:10:07 +0000 (15:10 -0200)]
USB: Add YISO u893 usb modem vendor and product IDs to option driver

This patch adds YISO u893 usb modem vendor and product ID to option.c.

I had a better experience using this modification and the same system.

Signed-off-by: Leslie Harlley Watter <>
Signed-off-by: Greg Kroah-Hartman <>
14 years agousb: musb: fix BULK request on different available endpoints
Ajay Kumar Gupta [Wed, 29 Oct 2008 13:10:35 +0000 (15:10 +0200)]
usb: musb: fix BULK request on different available endpoints

Fixes co-working issue of usb serial device with usb/net devices while
oter endpoints are free and can be used.This patch implements the policy
that if endpoint resources are available then different BULK request goes
to different endpoint otherwise they are multiplexed to one reserved
endpoint as currently done.

Switch statement case is reordered in musb_giveback() to take care of
bulk request both in multiplex scenario and otherwise.

NAK limit scheme has to be added for multiplexed BULK request scenario
to avoid endpoint starvation due to usb/net devices.

Signed-off-by: Ajay Kumar Gupta <>
Signed-off-by: Felipe Balbi <>
Signed-off-by: Greg Kroah-Hartman <>
14 years agousb: musb: fix debug global variable name
Felipe Balbi [Wed, 29 Oct 2008 13:10:39 +0000 (15:10 +0200)]
usb: musb: fix debug global variable name

In order to avoid namespace conflicts, add a prefix
to our kernel-wise symbol.

Signed-off-by: Felipe Balbi <>
Signed-off-by: Greg Kroah-Hartman <>
14 years agousb: musb: Removes compilation warning in gadget mode
Ajay Kumar Gupta [Wed, 29 Oct 2008 13:10:38 +0000 (15:10 +0200)]
usb: musb: Removes compilation warning in gadget mode

Fixes compilation warning when musb is configured in gadget mode.

Signed-off-by: Ajay Kumar Gupta <>
Signed-off-by: Felipe Balbi <>
Signed-off-by: Greg Kroah-Hartman <>
14 years agousb: musb: tusb6010: kill compile warning
Felipe Balbi [Wed, 29 Oct 2008 13:10:36 +0000 (15:10 +0200)]
usb: musb: tusb6010: kill compile warning

Add an errno to failing case.

Signed-off-by: Felipe Balbi <>
Signed-off-by: Greg Kroah-Hartman <>
14 years agousb: musb: Fix for isochronous IN transfer
Ajay Kumar Gupta [Wed, 29 Oct 2008 13:10:31 +0000 (15:10 +0200)]
usb: musb: Fix for isochronous IN transfer

Fixes blurred capture images in dma mode. Isochronous error field in
urb and source data buffer pointer were not updated properly in dma

Signed-off-by: Ajay Kumar Gupta <>
Signed-off-by: Felipe Balbi <>
Signed-off-by: Greg Kroah-Hartman <>
14 years agoUSB: don't register endpoints for interfaces that are going away
Alan Stern [Wed, 29 Oct 2008 19:16:58 +0000 (15:16 -0400)]
USB: don't register endpoints for interfaces that are going away

This patch (as1155) fixes a bug in usbcore.  When interfaces are
deleted, either because the device was disconnected or because of a
configuration change, the extra attribute files and child endpoint
devices may get left behind.  This is because the core removes them
before calling device_del().  But during device_del(), after the
driver is unbound the core will reinstall altsetting 0 and recreate
those extra attributes and children.

The patch prevents this by adding a flag to record when the interface
is in the midst of being unregistered.  When the flag is set, the
attribute files and child devices will not be created.

Signed-off-by: Alan Stern <>
Cc: stable <> [2.6.27, 2.6.26, 2.6.25]
Signed-off-by: Greg Kroah-Hartman <>
14 years agoUSB: add Nikon D300 camera to unusual_devs
Paul Ready [Wed, 29 Oct 2008 21:25:50 +0000 (14:25 -0700)]
USB: add Nikon D300 camera to unusual_devs


When A Nikon D300 camera is connected to a system it is seen in
/proc/bus/pci/devices but is not accessible.

This is seen in the above file:

T:  Bus=01 Lev=01 Prnt=01 Port=05 Cnt=03 Dev#= 11 Spd=480 MxCh= 0
D:  Ver= 2.00 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs=  1
P:  Vendor=04b0 ProdID=041a Rev= 1.03
S:  Manufacturer=NIKON
S:  Product=NIKON DSC D300
S:  SerialNumber=000008014379
C:* #Ifs= 1 Cfg#= 1 Atr=c0 MxPwr=  2mA
I:* If#= 0 Alt= 0 #EPs= 3 Cls=06(still) Sub=01 Prot=01 Driver=usbfs
E:  Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
E:  Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
E:  Ad=83(I) Atr=03(Int.) MxPS=   8 Ivl=32ms

Cc: Alan Stern <>
Signed-off-by: Andrew Morton <>
Signed-off-by: Greg Kroah-Hartman <>
14 years agoUSB: vstusb: fix compiler warning on x86-64
Greg Kroah-Hartman [Fri, 31 Oct 2008 17:09:57 +0000 (10:09 -0700)]
USB: vstusb: fix compiler warning on x86-64

This fixes a reported compiler warning.

Reported-by: Randy Dunlap <>
Signed-off-by: Greg Kroah-Hartman <>
14 years agoMerge branch 'for-linus' of git://
Linus Torvalds [Thu, 13 Nov 2008 21:14:29 +0000 (13:14 -0800)]
Merge branch 'for-linus' of git://git./linux/kernel/git/jbarnes/pci-2.6

* 'for-linus' of git://
  PCI: ignore bit0 of _OSC return code

14 years agoMerge branch 'for-linus' of git://
Linus Torvalds [Thu, 13 Nov 2008 19:56:05 +0000 (11:56 -0800)]
Merge branch 'for-linus' of git://git./linux/kernel/git/teigland/dlm

* 'for-linus' of git://
  dlm: fix shutdown cleanup

14 years agoMerge branch 'for-linus' of git://
Linus Torvalds [Thu, 13 Nov 2008 19:30:46 +0000 (11:30 -0800)]
Merge branch 'for-linus' of git://git./linux/kernel/git/penberg/slab-2.6

* 'for-linus' of git://
  slab: document SLAB_DESTROY_BY_RCU
  Kconfig: SLUB is the default slab allocator

14 years agoMerge
Linus Torvalds [Thu, 13 Nov 2008 19:30:25 +0000 (11:30 -0800)]

  [ARM] cdb89712: avoid namespace clashes with SRAM_ and BOOTROM_ constants
  [ARM] cdb89712,clps7500,h720x: avoid namespace clash for FLASH_* constants
  [ARM] integrator,realview,versatile: remove FLASH_* and EPROM_* constants
  [ARM] dma-mapping: fix compiler warning
  [ARM] iop: iop3xx needs registers mapped uncached+unbuffered
  [ARM] versatile: correct MMC clock rate
  [ARM] realview: correct MMC clock rate
  [ARM] 5329/1: Feroceon: fix feroceon_l2_inv_range

14 years agofix cpumask build breakage on parisc
Helge Deller [Thu, 13 Nov 2008 17:55:54 +0000 (18:55 +0100)]
fix cpumask build breakage on parisc

Commit 2d3854a37e8b767a51aba38ed6d22817b0631e33 ("cpumask: introduce new
API, without changing anything") introduced a build breakage on parisc.

This trivial patch fixes it.

Signed-off-by: Helge Deller <>
Cc: Rusty Russell <>
Cc: Andrew Morton <>
Cc: Kyle Mc Martin <>
Signed-off-by: Linus Torvalds <>
14 years agodlm: fix shutdown cleanup
David Teigland [Thu, 13 Nov 2008 19:22:34 +0000 (13:22 -0600)]
dlm: fix shutdown cleanup

Fixes a regression from commit 0f8e0d9a317406612700426fad3efab0b7bbc467,
"dlm: allow multiple lockspace creates".

An extraneous 'else' slipped into a code fragment being moved from
release_lockspace() to dlm_release_lockspace().  The result of the
unwanted 'else' is that dlm threads and structures are not stopped
and cleaned up when the final dlm lockspace is removed.  Trying to
create a new lockspace again afterward will fail with
"kmem_cache_create: duplicate cache dlm_conn" because the cache
was not previously destroyed.

Signed-off-by: David Teigland <>
14 years agoslab: document SLAB_DESTROY_BY_RCU
Peter Zijlstra [Thu, 13 Nov 2008 18:40:12 +0000 (20:40 +0200)]
slab: document SLAB_DESTROY_BY_RCU

Explain this SLAB_DESTROY_BY_RCU thing...

[ add a pointer to comment in mm/slab.c]
Signed-off-by: Peter Zijlstra <>
Acked-by: Jens Axboe <>
Acked-by: Paul E. McKenney <>
Acked-by: Christoph Lameter <>
Signed-off-by: Hugh Dickins <>
Signed-off-by: Pekka Enberg <>
14 years agoKconfig: SLUB is the default slab allocator
Simon Arlott [Wed, 5 Nov 2008 22:18:19 +0000 (22:18 +0000)]
Kconfig: SLUB is the default slab allocator

In 2007, a0acd820807680d2ccc4ef3448387fcdbf152c73 changed the default
slab allocator to SLUB, but the SLAB help text still says SLAB is the
default. This change fixes that.

Signed-off-by: Simon Arlott <>
Signed-off-by: Pekka Enberg <>
14 years ago[ARM] cdb89712: avoid namespace clashes with SRAM_ and BOOTROM_ constants
Russell King [Thu, 13 Nov 2008 15:02:41 +0000 (15:02 +0000)]
[ARM] cdb89712: avoid namespace clashes with SRAM_ and BOOTROM_ constants

Signed-off-by: Russell King <>
14 years ago[ARM] cdb89712,clps7500,h720x: avoid namespace clash for FLASH_* constants
Russell King [Thu, 13 Nov 2008 14:53:08 +0000 (14:53 +0000)]
[ARM] cdb89712,clps7500,h720x: avoid namespace clash for FLASH_* constants

Signed-off-by: Russell King <>
14 years ago[ARM] integrator,realview,versatile: remove FLASH_* and EPROM_* constants
Russell King [Thu, 13 Nov 2008 14:43:03 +0000 (14:43 +0000)]
[ARM] integrator,realview,versatile: remove FLASH_* and EPROM_* constants

FLASH_* and EPROM_* constants are unused, and clash with drivers:

drivers/atm/ambassador.h:257:1: warning: "FLASH_BASE" redefined
drivers/atm/ambassador.h:258:1: warning: "FLASH_SIZE" redefined
drivers/atm/iphase.h:332:1: warning: "EPROM_SIZE" redefined

so remove them.

Signed-off-by: Russell King <>
14 years ago[ARM] dma-mapping: fix compiler warning
Russell King [Thu, 13 Nov 2008 14:33:51 +0000 (14:33 +0000)]
[ARM] dma-mapping: fix compiler warning

arch/arm/mm/dma-mapping.c: In function `dma_sync_sg_for_cpu':
arch/arm/mm/dma-mapping.c:588: warning: statement with no effect

Signed-off-by: Russell King <>
14 years agoALSA: hda - Missing NULL check in hda_beep.c
Takashi Iwai [Thu, 13 Nov 2008 12:08:56 +0000 (13:08 +0100)]
ALSA: hda - Missing NULL check in hda_beep.c

Added a NULL check of input_allocate_device() in hda_beep.c.

Signed-off-by: Takashi Iwai <>
14 years agoALSA: hda - Add digital beep playback switch for STAC/IDT codecs
Takashi Iwai [Wed, 12 Nov 2008 15:45:04 +0000 (16:45 +0100)]
ALSA: hda - Add digital beep playback switch for STAC/IDT codecs

The digital beep widget may have no mute control, and always enabling
the beep is ofen pretty annoying, especially on laptops.

This patch adds a mixer control "PC Beep Playback Switch" when there
is no mixer amp mute is found, and controls it on software.

Reference: Novell bnc#444572

Signed-off-by: Takashi Iwai <>
14 years agoserial: sh-sci: Reorder the SCxTDR write after the TDxE clear.
Paul Mundt [Thu, 13 Nov 2008 08:46:06 +0000 (17:46 +0900)]
serial: sh-sci: Reorder the SCxTDR write after the TDxE clear.

Under qemu there is a race between the TDxE read-and-clear and the SCxTDR
write. While on hardware it can be gauranteed that the read-and-clear
will happen prior to the character being written out, no such assumption
can be made under emulation. As this path happens with IRQs off and the
hardware itself doesn't care about the ordering, move the SCxTDR write
until after the read-and-clear.

Signed-off-by: Vladimir Prus <>
Signed-off-by: Paul Mundt <>
14 years agosh: __copy_user function can corrupt the stack in case of exception
Stuart MENEFY [Fri, 10 Oct 2008 18:49:30 +0000 (19:49 +0100)]
sh: __copy_user function can corrupt the stack in case of exception

The __copy_user function can corrupt the stack in the case of a
non-trivial length of data, and either of the first two move instructions
cause an exception. This is because the fixup for these two instructions
is mapped to the no_pop case, but these instructions execute after the
stack is pushed.

This change creates an explicit NO_POP exception mapping macro, and uses
it for the two instructions executed in the trivial case where no stack
pushes occur.

More information at ST Linux bugzilla:

Signed-off-by: Dylan Reid <>
Signed-off-by: Stuart Menefy <>
Signed-off-by: Paul Mundt <>
14 years agosh: Fixed the TMU0 reload value on resume
Francesco VIRLINZI [Wed, 15 Oct 2008 09:58:24 +0000 (11:58 +0200)]
sh: Fixed the TMU0 reload value on resume

This patch fixes the TMU0 interrupt frequency on suspend/resume.
During the resume the kernel reprograms the TMU0.ClockEvent mode
but if the mode is periodic than the TMU0.TCOR is updated with
a random wrong value without taking care latest valid saved value.

There was no problem with No_HZ system where TMU0.TCOR isn't used.

Signed-off-by: Francesco M. Virlinzi <>
Signed-off-by: Stuart Menefy <>
Signed-off-by: Paul Mundt <>
14 years agosh: Don't factor in PAGE_OFFSET for valid_phys_addr_range() check.
Paul Mundt [Thu, 13 Nov 2008 06:38:02 +0000 (15:38 +0900)]
sh: Don't factor in PAGE_OFFSET for valid_phys_addr_range() check.

Signed-off-by: Paul Mundt <>
14 years agosh: early printk port type fix
Magnus Damm [Thu, 13 Nov 2008 06:33:45 +0000 (15:33 +0900)]
sh: early printk port type fix

Add PORT_SCIF to unbreak the early printk code.

Signed-off-by: Magnus Damm <>
Signed-off-by: Paul Mundt <>