Alan Stern
bcca06efea
USB: don't enable wakeup by default for PCI host controllers ...
This patch (as1199) changes the initial wakeup settings for PCI USB
host controllers. The controllers are marked as capable of waking the
system, but wakeup is not enabled by default.
It turns out that enabling wakeup for USB host controllers has a lot
of bad consequences. As the simplest example, if a USB mouse or
keyboard is unplugged immediately after the computer is put to sleep,
the unplug will cause the system to wake back up again! We are better
off marking them as wakeup-capable and leaving wakeup disabled.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Reported-by: Rafael J. Wysocki <rjw@sisk.pl>
CC: David Brownell <david-b@pacbell.net>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-01-27 16:15:32 -08:00
Merge branch 'misc' into release
2009-01-16 14:45:34 -05:00
[ARM] Fix realview build
2009-01-08 16:29:41 +00:00
sata_fsl: Return non-zero on error in probe()
2009-01-16 10:23:58 -05:00
generic swap(): iphase: rename swap() to swap_byte_order()
2009-01-08 08:31:14 -08:00
driver core: Convert '/' to '!' in dev_set_name()
2009-01-20 20:52:08 -08:00
powerpc/ps3: Printing fixups for l64 to ll64 conversion drivers/block
2009-01-16 16:15:13 +11:00
Merge master.kernel.org:/home/rmk/linux-2.6-arm
2009-01-26 15:12:47 -08:00
Merge branch 'cpus4096-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2009-01-10 06:12:18 -08:00
m68k: dio - Kill resource_size_t format warnings
2009-01-12 20:56:42 +01:00
i.MX31: Image Processing Unit DMA and IRQ drivers
2009-01-19 15:36:21 -07:00
firewire: core: fix sleep in atomic context due to driver core change
2009-01-09 23:22:32 +01:00
dell_rbu: use scnprintf() instead of less secure sprintf()
2009-01-17 14:27:18 -08:00
gpio: fix probe() error return in gpio driver probes
2009-01-15 16:39:35 -08:00
Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
2009-01-26 15:11:41 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
2009-01-07 15:37:24 -08:00
Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
2009-01-15 16:40:12 -08:00
i2c: Move old eeprom driver to /drivers/misc/eeprom
2009-01-26 21:19:53 +01:00
drivers/ide/palm_bk3710.c buildfix
2009-01-19 13:46:57 +01:00
i2c: Delete many unused adapter IDs
2009-01-26 21:19:52 +01:00
Merge branches 'ehca', 'ipoib' and 'mlx4' into for-linus
2009-01-16 15:05:54 -08:00
input: PCF50633 input driver
2009-01-11 01:34:25 +01:00
isdn: Fix missing ifdef in isdn_ppp
2009-01-26 12:24:38 -08:00
lis3lv02d: merge with leds hp disk
2009-01-15 16:39:40 -08:00
md: don't retry recovery of raid1 that fails due to error on source drive.
2009-01-09 08:31:11 +11:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
2009-01-08 11:05:59 -08:00
memstick: annotate endianness of attribute structs
2009-01-09 16:54:41 -08:00
[SCSI] mpt fusion: Add Firmware debug support
2009-01-13 10:36:02 -06:00
Merge master.kernel.org:/home/rmk/linux-2.6-arm
2009-01-13 14:52:35 -08:00
eeprom: More consistent symbol names
2009-01-26 21:19:57 +01:00
[ARM] 5369/1: omap mmc: Add new omap hsmmc controller for 2430 and 34xx, v3
2009-01-24 11:41:21 +00:00
ARM: OMAP: Fix gpio by switching to generic gpio calls, v2
2009-01-15 13:09:52 +02:00
Merge master.kernel.org:/home/rmk/linux-2.6-arm
2009-01-26 15:12:47 -08:00
drivers/of: Add the of_find_i2c_device_by_node function.
2009-01-09 15:49:06 -07:00
oprofile: fix uninitialized use of struct op_entry
2009-01-17 17:26:39 +01:00
fix early_serial_setup() regression
2009-01-13 14:03:43 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
2009-01-26 10:13:36 -08:00
powerpc: Change u64/s64 to a long long integer type
2009-01-13 14:47:59 +11:00
Merge branch 'misc' into release
2009-01-16 14:45:34 -05:00
Merge branch 'linus' into release
2009-01-09 03:39:43 -05:00
power_supply: pda_power: Don't request shared IRQs w/ IRQF_DISABLED
2009-01-26 02:09:26 +03:00
powerpc/ps3: Printing fixups for l64 to ll64 conversion drivers/ps3
2009-01-16 16:15:14 +11:00
move wm8400-regulator's probe function to .devinit.text
2009-01-17 13:46:40 +00:00
rtc: rtc-twl4030 don't mask alarm interrupts on shutdown
2009-01-15 16:39:36 -08:00
lcs: fix compilation for !CONFIG_IP_MULTICAST
2009-01-25 17:59:26 -08:00
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2009-01-16 08:41:09 -08:00
sh: fix sh-sci / early printk build on sh7723
2009-01-21 17:44:32 +09:00
spi: Move at25 (for SPI eeproms) to /drivers/misc/eeprom
2009-01-26 21:19:54 +01:00
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
2009-01-07 17:22:04 -08:00
USB: don't enable wakeup by default for PCI host controllers
2009-01-27 16:15:32 -08:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
2009-01-08 11:05:59 -08:00
Merge master.kernel.org:/home/rmk/linux-2.6-arm
2009-01-26 15:12:47 -08:00
w1: send status messages after command processing
2009-01-08 08:31:14 -08:00
[ARM] omap: watchdog: allow OMAP watchdog driver on OMAP34xx platforms
2009-01-24 16:48:42 +00:00
xen: unitialised return value in xenbus_write_transaction
2009-01-26 14:29:26 +01:00
m68k: zorro - Use %pR to print resources
2009-01-12 20:56:43 +01:00
Merge branch 'drivers-platform' into release
2009-01-09 04:56:56 -05:00
bcca06efea