Alexandre Courbot
36003386f8
serial: sh-sci: fix deadlock when resuming from S3 sleep ...
S3 sleep invokes the shutdown callback of the sh-sci driver, which
suspends the clocks until they are reactivated by a call to startup.
However, before the latter is invoked, sci_set_termios may be called on
the port by uart_resume_port. In such cases it will endlessly wait for
the TEND bit to raise, which will never happen since the clocks are
disabled.
This patch ensures that clocks are enabled when ports registers are
manipulated within sci_set_termios.
Signed-off-by: Alexandre Courbot <gnurou@gmail.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
2011-03-04 15:57:10 +09:00
ACPI / PM: Call suspend_nvs_free() earlier during resume
2011-01-20 18:30:17 -08:00
libata: set queue DMA alignment to sector size for ATAPI too
2011-01-28 03:16:20 -05:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
2011-01-24 13:17:06 -08:00
PM / Runtime: Don't enable interrupts while running in_interrupt
2011-01-25 20:50:07 +01:00
nbd: remove module-level ioctl mutex
2011-02-11 16:12:20 -08:00
Bluetooth: ath3k: reduce memory usage
2011-01-19 14:40:41 -02:00
cdrom: support devices that have check_events but not media_changed
2011-02-09 14:22:37 +01:00
Merge branch 'for-james' of git://tpmdd.git.sourceforge.net/gitroot/tpmdd/tpmdd into for-linus
2011-02-11 17:34:47 +11:00
drivers/clocksource/tcb_clksrc.c: fix init sequence
2011-01-26 10:50:04 +10:00
kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT
2011-01-20 17:02:05 -08:00
amd64_edac: Fix DIMMs per DCTs output
2011-02-10 14:41:49 +01:00
Merge branches 'fixes' and 'fwnet' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
2011-01-21 13:34:39 -08:00
kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT
2011-01-20 17:02:05 -08:00
drivers/gpio/pca953x.c: add a mutex to fix race condition
2011-02-11 16:12:20 -08:00
Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
2011-02-04 10:02:22 -08:00
kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT
2011-01-20 17:02:05 -08:00
hwmon: (emc1403) Fix I2C address range
2011-02-09 13:45:52 -08:00
kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT
2011-01-20 17:02:05 -08:00
fix a shutdown regression in intel_idle
2011-01-25 05:57:34 +10:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
2011-02-03 11:19:26 -08:00
arm/ixp4xx: Rename FREQ macro to avoid collisions
2011-02-06 16:49:48 +01:00
isdn: hysdn: Kill (partially buggy) CVS regision log reporting.
2011-02-09 13:56:53 -08:00
leds: leds-pwm: return proper error if pwm_request failed
2011-01-26 10:49:58 +10:00
lguest: compile fixes
2011-01-20 21:37:29 +10:30
powerpc/macintosh: Fix wrong test in fan_{read,write}_reg()
2011-01-21 14:08:34 +11:00
FIX: md: process hangs at wait_barrier after 0->10 takeover
2011-02-08 11:49:02 +11:00
Merge branch 'media_fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
2011-02-02 17:52:19 -08:00
ARM: mmci: round down the bytes transferred on error
2011-01-31 10:53:37 +00:00
Revert "UBI: use mtd->writebufsize to set minimal I/O unit size"
2011-01-29 18:27:13 +02:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
2011-02-10 12:05:09 -08:00
parport: make lockdep happy with waitlist_lock
2011-01-26 10:49:59 +10:00
Revert "pci: use security_capable() when checking capablities during config space read"
2011-02-13 07:50:50 -08:00
kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT
2011-01-20 17:02:05 -08:00
intel_scu_ipc: remove duplicated #include
2011-01-31 12:59:34 +10:00
pps: claim parallel port exclusively
2011-01-26 10:50:00 +10:00
rapidio: fix new kernel-doc warnings
2011-01-22 20:32:37 -08:00
drivers/rtc/rtc-proc.c: add module_put on error path in rtc_proc_open()
2011-02-11 16:12:20 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
2011-02-04 13:20:01 -08:00
[SCSI] libsas: fix runaway error handler problem
2011-01-24 11:52:33 -06:00
spi/spi_sh_msiof: fix wrong address calculation, which leads to an Oops
2011-01-21 09:26:24 -07:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
2011-02-08 12:03:54 -08:00
Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
2011-02-10 12:19:23 -08:00
serial: sh-sci: fix deadlock when resuming from S3 sleep
2011-03-04 15:57:10 +09:00
USB: cdc-acm: Adding second ACM channel support for Nokia N8
2011-02-04 12:38:14 -08:00
vhost: rcu annotation fixup
2011-02-01 16:48:46 +02:00
console: rename acquire/release_console_sem() to console_lock/unlock()
2011-01-26 10:50:06 +10:00
virtio: remove virtio-pci root device
2011-01-20 21:37:30 +10:30
drivers/w1/masters/omap_hdq.c: add missing clk_put
2011-02-11 16:12:20 -08:00
Merge branches 'sh/wdt', 'sh/pci-express-async' and 'common/serial-rework' into sh-latest
2011-01-26 18:24:18 +09:00
Merge branch 'xen/xenbus' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen
2011-01-20 16:37:28 -08:00
Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
2011-01-20 16:39:23 -08:00
36003386f8