diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-07 17:02:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-07 17:02:29 -0700 |
| commit | c52ecdab06ff3b4d0f8914951eb74dc8b049f51c (patch) | |
| tree | 291a55adb3be3fec45dcc6affa72d9d1244ba42a /drivers | |
| parent | dc315011312f04433e0fdd34b6a3dde4bfde1e48 (diff) | |
| parent | c0f85a82484c25d23b44a87a35daddb2b276b4aa (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] pxa: fix pxa27x keyboard driver
[ARM] Fix 4417/1: Serial: Fix AMBA drivers locking
[ARM] 4421/1: AT91: Value of _KEY fields.
[ARM] Solve buggy smp_processor_id() usage
[ARM] 4422/1: Fix default value handling in gpio_direction_output (PXA)
[ARM] 4419/1: AT91: SAM9 USB clocks check for suspending
[ARM] 4418/1: AT91: Number of programmable clocks differs
[ARM] 4392/2: Do not corrupt the SP register in compressed/head.S
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/input/keyboard/pxa27x_keyboard.c | 6 | ||||
| -rw-r--r-- | drivers/serial/amba-pl010.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/input/keyboard/pxa27x_keyboard.c b/drivers/input/keyboard/pxa27x_keyboard.c index 06eaf766d9d..f9e82c9ca42 100644 --- a/drivers/input/keyboard/pxa27x_keyboard.c +++ b/drivers/input/keyboard/pxa27x_keyboard.c @@ -104,7 +104,7 @@ static int pxakbd_open(struct input_dev *dev) KPREC = 0x7F; /* Enable unit clock */ - pxa_set_cken(CKEN19_KEYPAD, 1); + pxa_set_cken(CKEN_KEYPAD, 1); return 0; } @@ -112,7 +112,7 @@ static int pxakbd_open(struct input_dev *dev) static void pxakbd_close(struct input_dev *dev) { /* Disable clock unit */ - pxa_set_cken(CKEN19_KEYPAD, 0); + pxa_set_cken(CKEN_KEYPAD, 0); } #ifdef CONFIG_PM @@ -185,7 +185,7 @@ static int __devinit pxakbd_probe(struct platform_device *pdev) DRIVER_NAME, pdev); if (error) { printk(KERN_ERR "Cannot request keypad IRQ\n"); - pxa_set_cken(CKEN19_KEYPAD, 0); + pxa_set_cken(CKEN_KEYPAD, 0); goto err_free_dev; } diff --git a/drivers/serial/amba-pl010.c b/drivers/serial/amba-pl010.c index 00d1255e4c1..e88da72f830 100644 --- a/drivers/serial/amba-pl010.c +++ b/drivers/serial/amba-pl010.c @@ -167,9 +167,9 @@ static void pl010_rx_chars(struct uart_amba_port *uap) ignore_char: status = readb(uap->port.membase + UART01x_FR); } - spin_unlock(&port->lock); + spin_unlock(&uap->port.lock); tty_flip_buffer_push(tty); - spin_lock(&port->lock); + spin_lock(&uap->port.lock); } static void pl010_tx_chars(struct uart_amba_port *uap) |