Rafael J. Wysocki 076a5dc21f PCI/PM: Fix fallback to PCI_D0 in pci_platform_power_transition() ... commit 769ba7212f upstream. Commit b51306c (PCI: Set device power state to PCI_D0 for device without native PM support) modified pci_platform_power_transition() by adding code causing dev->current_state for devices that don't support native PCI PM but are power-manageable by the platform to be changed to PCI_D0 regardless of the value returned by the preceding platform_pci_set_power_state(). In particular, that also is done if the platform_pci_set_power_state() has been successful, which causes the correct power state of the device set by pci_update_current_state() in that case to be overwritten by PCI_D0. Fix that mistake by making the fallback to PCI_D0 only happen if the platform_pci_set_power_state() has returned an error. [bhelgaas: folded in Yinghai's simplification, added URL & stable info] Reference: http://lkml.kernel.org/r/27806FC4E5928A408B78E88BBC67A2306F466BBA@ORSMSX101.amr.corp.intel.com Reported-by: Chris J. Benenati <chris.j.benenati@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Acked-by: Yinghai Lu <yinghai@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2013-05-07 19:51:55 -07:00
..
accessibility
acpi	PCI / ACPI: Don't query OSC support with all possible controls	2013-05-07 19:51:54 -07:00
amba	ARM: 7366/3: amba: Remove AMBA level regulator support	2012-04-13 14:04:08 +01:00
ata	ata_piix: Fix DVD not dectected at some Haswell platforms	2013-04-12 09:38:45 -07:00
atm	atm/iphase: rename fregt_t -> ffreg_t	2013-02-14 10:49:05 -08:00
auxdisplay
base	regmap: cache Fix regcache-rbtree sync	2013-04-12 09:38:43 -07:00
bcma	bcma: mips: fix clearing device IRQ	2013-01-17 08:50:41 -08:00
block	Revert "xen/blkback: Don't trust the handle from the frontend."	2013-04-05 10:04:52 -07:00
bluetooth	Bluetooth: Add support for Dell[QCA 0cf3:817a]	2013-04-05 10:04:15 -07:00
cdrom
char	vm: convert HPET mmap to vm_iomap_memory() helper	2013-04-25 21:19:56 -07:00
clk	clk: Check parent for NULL in clk_change_rate	2012-07-19 08:58:59 -07:00
clocksource	Revert "clocksource: Load the ACPI PM clocksource asynchronously"	2012-04-12 00:05:05 +02:00
connector
cpufreq	Fix memory leak in cpufreq stats.	2013-03-14 11:29:51 -07:00
cpuidle	Merge branches 'idle-fix' and 'misc' into release	2012-04-06 21:48:59 -04:00
crypto	crypto: mv_cesa requires on CRYPTO_HASH to build	2012-05-15 01:10:06 +00:00
dca	dca: check against empty dca_domains list before unregister provider	2013-02-28 06:59:06 -08:00
devfreq
dio
dma	ioat: Fix DMA memory sync direction correct flag	2013-01-27 20:47:44 -08:00
edac	EDAC: Test correct variable in ->store function	2013-02-03 18:24:41 -06:00
eisa	EISA/PCI: Fix bus res reference	2013-04-12 09:38:44 -07:00
firewire	firewire: add minor number range check to fw_device_init()	2013-03-04 06:06:41 +08:00
firmware	efivars: Handle duplicate names from get_next_variable()	2013-04-05 10:04:36 -07:00
gpio	gpiolib: Don't return -EPROBE_DEFER to sysfs, or for invalid gpios	2012-11-05 09:50:41 +01:00
gpu	fbcon: fix locking harder	2013-04-25 21:19:56 -07:00
hid	HID: usbhid: quirk for Realtek Multi-card reader	2013-04-05 10:04:16 -07:00
hsi	HSI: hsi_char: Remove max_data_size from sysfs	2012-04-23 14:23:32 +03:00
hv	Drivers: hv: Cleanup error handling in vmbus_open()	2012-10-31 10:02:58 -07:00
hwmon	hwmon: (sht15) Fix memory leak if regulator_enable() fails	2013-03-20 13:05:00 -07:00
hwspinlock	hwspinlock: fix __hwspin_lock_request error path	2013-04-12 09:38:46 -07:00
i2c	i2c: xiic: must always write 16-bit words to TX_FIFO	2013-05-07 19:51:54 -07:00
ide
idle	simple_open: automatically convert to simple_open()	2012-04-05 15:25:50 -07:00
ieee802154
infiniband	IPoIB: Fix send lockup due to missed TX completion	2013-03-28 12:12:25 -07:00
input	Input: sentelic - only report position of first finger as ST coordinates	2013-01-11 09:06:56 -08:00
iommu	iommu/amd: Make sure dma_ops are set for hotplug devices	2013-04-05 10:04:18 -07:00
isdn	isdn/gigaset: fix zero size border case in debug dump	2013-02-14 10:49:04 -08:00
leds	drivers/leds/leds-lp5521.c: fix lp5521_read() error handling	2012-12-03 11:46:36 -08:00
lguest
macintosh
mca
md	md: raid0: fix error return from create_stripe_zones.	2013-03-14 11:29:49 -07:00
media	media: rc: unlock on error in show_protocols()	2013-03-04 06:06:41 +08:00
memstick
message	Disintegrate and delete asm/system.h	2012-03-28 15:58:21 -07:00
mfd	mfd: Only unregister platform devices allocated by the mfd core	2013-01-17 08:50:45 -08:00
misc	SGI-XP: handle non-fatal traps	2013-01-11 09:06:29 -08:00
mmc	mmc: sdhci-esdhc-imx: fix host version read	2013-02-28 06:59:05 -08:00
mtd	vm: convert mtdchar mmap to vm_iomap_memory() helper	2013-04-25 21:19:56 -07:00
net	gianfar: do not advertise any alarm capability.	2013-05-07 19:51:53 -07:00
nfc	NFC: pn533: Fix mem leak in pn533_in_dep_link_up	2012-12-03 11:47:12 -08:00
nubus
of	gpio: Fix range check in of_gpio_simple_xlate()	2012-04-10 14:20:56 -06:00
oprofile	oprofile: perf: use NR_CPUS instead or nr_cpumask_bits for static array	2012-07-16 09:04:21 -07:00
parisc	parisc: move definition of PAGE0 to asm/page.h	2012-05-10 15:12:08 -07:00
parport
pci	PCI/PM: Fix fallback to PCI_D0 in pci_platform_power_transition()	2013-05-07 19:51:55 -07:00
pcmcia	pcmcia/vrc4171: Add missing spinlock init	2013-02-28 06:59:05 -08:00
pinctrl	pinctrl: tegra: set low power mode bank width to 2	2012-10-28 10:14:14 -07:00
platform	asus-laptop: Do not call HWRS on init	2013-03-28 12:12:28 -07:00
pnp	pnpacpi: fix incorrect TEST_ALPHA() test	2013-01-11 09:06:29 -08:00
power	ab8500_btemp: Demote initcall sequence	2013-03-04 06:06:44 +08:00
pps
ps3
ptp	ptp_pch: Add missing #include <linux/slab.h>	2012-05-16 14:44:44 -04:00
rapidio	rapidio/tsi721: fix unused variable compiler warning	2012-09-14 10:00:20 -07:00
regulator	regulator: wm831x: Set the new rather than old value for DVS VSEL	2013-01-17 08:50:41 -08:00
remoteproc	remoteproc: fix a potential NULL-dereference on cleanup	2012-10-07 08:32:28 -07:00
rpmsg	rpmsg: fix dependency on initialization order	2012-07-19 08:58:57 -07:00
rtc	drivers/rtc/rtc-isl1208.c: call rtc_update_irq() from the alarm irq handler	2013-02-11 08:47:18 -08:00
s390	s390/memory hotplug: prevent offline of active memory increments	2013-05-07 19:51:53 -07:00
sbus
scsi	SCSI: libsas: fix handling vacant phy in sas_set_ex_phy()	2013-04-16 21:27:26 -07:00
sfi
sh	SuperH updates for 3.4 merge window	2012-03-30 00:09:17 -07:00
sn
spi	spi/mpc512x-psc: optionally keep PSC SS asserted across xfer segmensts	2013-04-12 09:38:43 -07:00
ssb	ssb: implement spurious tone avoidance	2013-04-25 21:19:55 -07:00
staging	staging: comedi: s626: fix continuous acquisition	2013-04-05 10:04:15 -07:00
target	target: Fix incorrect fallthrough of ALUA Standby/Offline/Transition CDBs	2013-04-16 21:27:26 -07:00
tc
thermal	thermal: return an error on failure to register thermal class	2013-04-12 09:38:47 -07:00
tty	tty: fix up atime/mtime mess, take three	2013-05-07 19:51:53 -07:00
uio
usb	usb-storage: CY7C68300A chips do not support Cypress ATACB	2013-05-07 19:51:53 -07:00
uwb	uwb: fix error handling	2012-04-18 13:15:51 -07:00
vhost	vhost/net: fix heads usage of ubuf_info	2013-03-28 12:11:54 -07:00
video	fbcon: when font is freed, clear also vc_font.data	2013-05-07 19:51:53 -07:00
virt
virtio	virtio: force vring descriptors to be allocated from lowmem	2013-01-11 09:06:47 -08:00
vlynq
w1	w1: fix oops when w1_search is called from netlink connector	2013-03-20 13:04:59 -07:00
watchdog	hpwdt: Fix kdump issue in hpwdt	2012-10-02 10:30:08 -07:00
xen	xen/pciback: Don't disable a PCI device that is already disabled.	2013-03-20 13:04:57 -07:00
zorro
Kconfig	Merge branch 'for-next' of git://gitorious.org/kernel-hsi/kernel-hsi	2012-04-02 09:50:40 -07:00
Makefile	Merge branch 'for-next' of git://gitorious.org/kernel-hsi/kernel-hsi	2012-04-02 09:50:40 -07:00