diff options
| author | Linus Torvalds | 2010-04-30 10:16:42 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2010-04-30 10:16:42 -0700 |
| commit | 87156d692afdc4c689e99380a263445217a4b76c (patch) | |
| tree | 918cd55f9338626c2d354cfe8b6a66e451fedf99 /drivers/serial | |
| parent | e4049eb8527668a6c7f97b944970b81d1316d5b0 (diff) | |
| parent | c61fae964a5ee04c4e4a01caecaf778c2e26e589 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:
serial: drivers/serial/pmac_zilog.c: add missing unlock
serial: 8250_pnp - add Fujitsu Wacom device
tty: Fix regressions in the char driver conversion
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/8250_pnp.c | 2 | ||||
| -rw-r--r-- | drivers/serial/pmac_zilog.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/drivers/serial/8250_pnp.c b/drivers/serial/8250_pnp.c index 24485cc62ff8..4822cb50cd0f 100644 --- a/drivers/serial/8250_pnp.c +++ b/drivers/serial/8250_pnp.c @@ -348,6 +348,8 @@ static const struct pnp_device_id pnp_dev_table[] = { { "FUJ02E6", 0 }, /* Fujitsu Wacom 2FGT Tablet PC device */ { "FUJ02E7", 0 }, + /* Fujitsu Wacom 1FGT Tablet PC device */ + { "FUJ02E9", 0 }, /* * LG C1 EXPRESS DUAL (C1-PB11A3) touch screen (actually a FUJ02E6 in * disguise) diff --git a/drivers/serial/pmac_zilog.c b/drivers/serial/pmac_zilog.c index 4eaa043ca2a8..700e10833bf9 100644 --- a/drivers/serial/pmac_zilog.c +++ b/drivers/serial/pmac_zilog.c @@ -752,8 +752,10 @@ static void pmz_break_ctl(struct uart_port *port, int break_state) uap->curregs[R5] = new_reg; /* NOTE: Not subject to 'transmitter active' rule. */ - if (ZS_IS_ASLEEP(uap)) + if (ZS_IS_ASLEEP(uap)) { + spin_unlock_irqrestore(&port->lock, flags); return; + } write_zsreg(uap, R5, uap->curregs[R5]); } |