diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-10-25 15:20:36 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-10-25 15:20:36 -0400 |
| commit | c64064ce9376a404e0888ca4a2985c8a4c16cec3 (patch) | |
| tree | f34d3b84ca970fdb381dad9a195c1367ce5d10f4 /drivers/tty/serial/sh-sci.c | |
| parent | 21b3de881b38a84002c07b1b4bfb91892644e83f (diff) | |
| parent | 456ba5a7802e58eccb5aa9751b3ab515ef99b9ca (diff) | |
Merge tag 'asoc-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.7
A couple of driver fixes, one that improves the interoperability of
WM8994 with controllers that are sensitive to extra BCLK cycles and some
build break fixes for ux500.
Diffstat (limited to 'drivers/tty/serial/sh-sci.c')
| -rw-r--r-- | drivers/tty/serial/sh-sci.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c index 9be296cf729..6ee59001d61 100644 --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c | |||
| @@ -530,7 +530,8 @@ static inline int sci_rxd_in(struct uart_port *port) | |||
| 530 | if (s->cfg->port_reg <= 0) | 530 | if (s->cfg->port_reg <= 0) |
| 531 | return 1; | 531 | return 1; |
| 532 | 532 | ||
| 533 | return !!__raw_readb(s->cfg->port_reg); | 533 | /* Cast for ARM damage */ |
| 534 | return !!__raw_readb((void __iomem *)s->cfg->port_reg); | ||
| 534 | } | 535 | } |
| 535 | 536 | ||
| 536 | /* ********************************************************************** * | 537 | /* ********************************************************************** * |