Dmitry Torokhov f6cd378372 Input: wacom - fix runtime PM related deadlock ... When runtime PM is enabled by default for input devices, X hangs in wacom open: [<ffffffff814a00ea>] mutex_lock+0x1a/0x40 [<ffffffffa02bc94b>] wacom_resume+0x3b/0x90 [wacom] [<ffffffff81327a32>] usb_resume_interface+0xd2/0x190 [<ffffffff81327b5d>] usb_resume_both+0x6d/0x110 [<ffffffff81327c24>] usb_runtime_resume+0x24/0x40 [<ffffffff8130a2cf>] __pm_runtime_resume+0x26f/0x450 [<ffffffff8130a23a>] __pm_runtime_resume+0x1da/0x450 [<ffffffff8130a53a>] pm_runtime_resume+0x2a/0x50 [<ffffffff81328176>] usb_autopm_get_interface+0x26/0x60 [<ffffffffa02bc626>] wacom_open+0x36/0x90 [wacom] wacom_open() takes wacom->lock and calls usb_autopm_get_interface(), which in turn calls wacom_resume() which tries to acquire the lock again. The fix is to call usb_autopm_get_interface() first, before we take the lock. Since we do not do usb_autopm_put_interface() until wacom_close() is called runtime PM is effectively disabled for the driver, however changing it now would risk regressions so the complete fix will have to wait till the next merge window. Reported-by: Jiri Slaby <jslaby@suse.cz> Acked-by: Oliver Neukum <oneukum@suse.de> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>		2010-10-04 22:36:41 -07:00
..
accessibility
acpi	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6	2010-08-15 17:37:07 -07:00
amba
ata	Merge branch 'linus' into release	2010-08-15 01:06:31 -04:00
atm	Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6	2010-08-12 09:11:31 -07:00
auxdisplay
base	drivers/base/node.c: reduce stack usage of node_read_meminfo()	2010-08-09 20:45:02 -07:00
block	Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6	2010-08-12 09:11:31 -07:00
bluetooth
cdrom
char	Input: use PIT_TICK_RATE in vt beep ioctl	2010-08-28 21:39:09 -07:00
clocksource
connector
cpufreq
cpuidle	cpuidle: extend cpuidle and menu governor to handle dynamic states	2010-08-09 20:45:04 -07:00
crypto	[S390] zcrypt: fix Kconfig dependencies	2010-08-13 10:06:54 +02:00
dca
dio
dma	Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6	2010-08-12 09:11:31 -07:00
edac	Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6	2010-08-12 09:11:31 -07:00
eisa
firewire
firmware	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2010-08-14 12:34:34 -07:00
gpio	gpiolib: Implement set_debounce for WM831x GPIOs	2010-08-12 11:27:57 +02:00
gpu	Input: sysrq - drop tty argument from sysrq ops handlers	2010-08-19 22:07:06 -07:00
hid	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2010-08-10 15:08:02 -07:00
hwmon	hwmon: (via-cputemp) Remove bogus "SHOW" global variable	2010-08-14 21:09:02 +02:00
i2c	Merge branch 'for-linus/i2c-2636' of git://git.fluff.org/bjdooks/linux	2010-08-14 11:57:54 -07:00
ide	ide: use module_param_named rather than module_param_call	2010-08-11 23:04:39 +09:30
idle	Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6	2010-08-15 11:17:52 -07:00
ieee1394
ieee802154
infiniband	Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6	2010-08-12 09:11:31 -07:00
input	Input: wacom - fix runtime PM related deadlock	2010-10-04 22:36:41 -07:00
isdn	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2010-08-13 10:38:12 -07:00
leds	Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6	2010-08-12 09:11:31 -07:00
lguest
macintosh	Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging	2010-08-12 10:06:29 -07:00
mca
md	dm mpath: support discard	2010-08-12 04:14:32 +01:00
media	v4l: Remove reference to bkl ioctl in compat ioctl handling	2010-08-14 00:24:24 +02:00
memstick	memstick: fix hangs on unexpected device removal in mspro_blk	2010-08-12 08:43:31 -07:00
message	fusion: add function parameter names to kernel-doc	2010-08-14 16:21:00 -07:00
mfd	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6	2010-08-12 10:01:30 -07:00
misc	Merge branch 'params' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus	2010-08-12 10:01:59 -07:00
mmc	Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6	2010-08-14 11:54:09 -07:00
mtd	Merge git://git.infradead.org/mtd-2.6	2010-08-15 17:32:47 -07:00
net	Input: sysrq - drop tty argument from sysrq ops handlers	2010-08-19 22:07:06 -07:00
nubus
of
oprofile
parisc
parport	Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6	2010-08-12 09:11:31 -07:00
pci	Merge git://git.infradead.org/iommu-2.6	2010-08-15 17:34:20 -07:00
pcmcia	Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6	2010-08-12 09:11:31 -07:00
platform	ideapad: Only allow camera state to be set to 0 or 1	2010-08-11 18:00:52 +01:00
pnp
power	Merge git://git.infradead.org/battery-2.6	2010-08-12 09:58:33 -07:00
pps
ps3
rapidio
regulator	regulator: Remove default DEBUG define from TPS6586x	2010-08-11 11:38:03 +01:00
rtc	Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6	2010-08-12 09:11:31 -07:00
s390	Input: sysrq - drop tty argument form handle_sysrq()	2010-08-21 00:34:45 -07:00
sbus
scsi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2010-08-14 12:34:34 -07:00
serial	Input: sysrq - drop tty argument form handle_sysrq()	2010-08-21 00:34:45 -07:00
sfi
sh
sn
spi	Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6	2010-08-14 11:54:09 -07:00
ssb
staging	param: remove unnecessary writable charp	2010-08-11 23:04:27 +09:30
tc
telephony
thermal
uio
usb	USB: drop tty argument from usb_serial_handle_sysrq_char()	2010-08-21 00:37:39 -07:00
uwb
vhost
video	Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging	2010-08-12 10:06:29 -07:00
virtio
vlynq
w1
watchdog	watchdog: hpwdt (12/12): Make NMI decoding a compile-time option	2010-08-13 20:54:53 +00:00
xen	Input: sysrq - drop tty argument form handle_sysrq()	2010-08-21 00:34:45 -07:00
zorro	zorro: Fix reading of proc/bus/zorro/* in small chunks	2010-08-09 21:14:08 +02:00
Kconfig
Makefile