linux/drivers, branch v2.6.30.9

thinkpad-acpi: fix incorrect use of TPACPI_BRGHT_MODE_ECNVRAM

2009-10-05T15:28:07Z

HBRV-based default selection of backlight control strategy didn't work well, at least the X41 defines it but doesn't use it and I don't think it will stop there. Switch to a blacklist, and make sure only Radeon- based models get ECNVRAM. Symptoms of incorrect backlight mode selection are: 1. Non-working backlight control through sysfs; 2. Backlight gets reset to the lowest level at every shutdown, reboot and when thinkpad-acpi gets unloaded; This fixes a regression in 2.6.30, bugzilla #13826. This fix is already present on 2.6.31. This is a minimal patch for 2.6.30-stable, based on mainline commits: 050df107c408a3df048524b3783a5fc6d4dccfdb, 7d95a3d564901e88ed42810f054e579874151999, 59fe4fe34d7afdf63208124f313be9056feaa2f4, 6da25bf51689a5cc60370d30275dbb9e6852e0cb Signed-off-by: Henrique de Moraes Holschuh Reported-by: Tobias Diedrich Reported-by: Robert de Rooy Signed-off-by: Greg Kroah-Hartman

PM / yenta: Fix cardbus suspend/resume regression

2009-10-05T15:28:06Z

commit 0c570cdeb8fdfcb354a3e9cd81bfc6a09c19de0c upstream. Since 2.6.29 the PCI PM core have been restoring the standard configuration registers of PCI devices in the early phase of resume. In particular, PCI devices without drivers have been handled this way since commit 355a72d75b3b4f4877db4c9070c798238028ecb5 (PCI: Rework default handling of suspend and resume). Unfortunately, this leads to post-resume problems with CardBus devices which cannot be accessed in the early phase of resume, because the sockets they are on have not been woken up yet at that point. To solve this problem, move the yenta socket resume to the early phase of resume and, analogously, move the suspend of it to the late phase of suspend. Additionally, remove some unnecessary PCI code from the yenta socket's resume routine. Fixes http://bugzilla.kernel.org/show_bug.cgi?id=13092, which is a post-2.6.28 regression. Signed-off-by: Rafael J. Wysocki Reported-by: Florian Signed-off-by: Greg Kroah-Hartman

PM / PCMCIA: Drop second argument of pcmcia_socket_dev_suspend()

2009-10-05T15:28:06Z

commit 827b4649d4626bf97b203b4bcd69476bb9b4e760 upstream. pcmcia_socket_dev_suspend() doesn't use its second argument, so it may be dropped safely. This change is necessary for the subsequent yenta suspend/resume fix. Signed-off-by: Rafael J. Wysocki Signed-off-by: Greg Kroah-Hartman

ahci: restore pci_intx() handling

2009-10-05T15:27:58Z

commit 31b239ad1ba7225435e13f5afc47e48eb674c0cc upstream. Commit a5bfc4714b3f01365aef89a92673f2ceb1ccf246 dropped explicit pci_intx() manipulation from ahci because it seemed unnecessary and ahci doesn't seem to be the right place to be tweaking it if it were. This was largely okay but there are exceptions. There was one on an embedded platform which was fixed via firmware and now bko#14124 reports it on a HP DL320. http://bugzilla.kernel.org/show_bug.cgi?id=14124 I still think this isn't something libata drivers should be caring about (the only ones which are calling pci_intx() explicitly are libata ones and one other driver) but for now reverting the change seems to be the right thing to do. Signed-off-by: Tejun Heo Reported-by: Thomas Jarosch Signed-off-by: Jeff Garzik Signed-off-by: Greg Kroah-Hartman

p54usb: add Zcomax XG-705A usbid

2009-10-05T15:27:50Z

commit f7f71173ea69d4dabf166533beffa9294090b7ef upstream. This patch adds a new usbid for Zcomax XG-705A to the device table. Reported-by: Jari Jaakola Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman

ACPI: pci_slot.ko wants a 64-bit _SUN

2009-10-05T15:27:44Z

commit 7e24bc1ce669b2876ffa475ea1147f2bb9ffdc52 upstream. Similar to commit b6adc195 (PCI hotplug: acpiphp wants a 64-bit _SUN), pci_slot.ko reads and creates sysfs directories based on the _SUN method. Certain HP platforms return 64 bits in _SUN. This change to pci_slot.ko allows us to see the correct sysfs directories. Reported-by: Chad Smith Signed-off-by: Alex Chiang Signed-off-by: Len Brown Signed-off-by: Greg Kroah-Hartman

PCI: Unhide the SMBus on the Compaq Evo D510 USDT

2009-09-24T15:27:29Z

commit 6b5096e4d4496e185cd1ada5d1b8e1d941c805ed upstream. One more form factor for Compaq Evo D510, which needs the same quirk as the other form factors. Apparently there's no hardware monitoring chip on that one, but SPD EEPROMs, so it's still worth unhiding the SMBus. Signed-off-by: Jean Delvare Tested-by: Nuzhna Pomoshch Signed-off-by: Jesse Barnes Signed-off-by: Greg Kroah-Hartman

libata: fix off-by-one error in ata_tf_read_block()

2009-09-24T15:27:28Z

commit ac8672ea922bde59acf50eaa1eaa1640a6395fd2 upstream. ata_tf_read_block() has off-by-one error when converting CHS address to LBA. The bug isn't very visible because ata_tf_read_block() is used only when generating sense data for a failed RW command and CHS addressing isn't used too often these days. This problem was spotted by Atsushi Nemoto. Signed-off-by: Tejun Heo Reported-by: Atsushi Nemoto Signed-off-by: Jeff Garzik Signed-off-by: Greg Kroah-Hartman

virtio_blk: don't bounce highmem requests

2009-09-24T15:27:28Z

commit 4eff3cae9c9809720c636e64bc72f212258e0bd5 upstream virtio_blk: don't bounce highmem requests By default a block driver bounces highmem requests, but virtio-blk is perfectly fine with any request that fit into it's 64 bit addressing scheme, mapped in the kernel virtual space or not. Besides improving performance on highmem systems this also makes the reproducible oops in __bounce_end_io go away (but hiding the real cause). Signed-off-by: Christoph Hellwig Signed-off-by: Rusty Russell Cc: Chuck Ebbert Signed-off-by: Greg Kroah-Hartman

V4L: em28xx: set up tda9887_conf in em28xx_card_setup()

2009-09-24T15:27:27Z

V4L: em28xx: set up tda9887_conf in em28xx_card_setup() (cherry picked from commit ae3340cbf59ea362c2016eea762456cc0969fd9e) Added tda9887_conf set up into em28xx_card_setup() Signed-off-by: Franklin Meng Signed-off-by: Douglas Schilling Landgraf Signed-off-by: Mauro Carvalho Chehab Tested-by: Larry Finger Signed-off-by: Michael Krufky Signed-off-by: Greg Kroah-Hartman