diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-02-01 10:22:47 +0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-02-01 10:22:47 +0400 |
| commit | 8058e14259ddc8c1824387198fc53700ed4cccc9 (patch) | |
| tree | faffb83ca5173e5f3cbfd4170de603ada4812e23 /drivers/tty/serial/samsung.c | |
| parent | 9ddf1aeb2134e72275c97a2c6ff2e3eb04f2f27a (diff) | |
| parent | 7da58046482fceb17c4a0d4afefd9507ec56de7f (diff) | |
| download | linux-8058e14259ddc8c1824387198fc53700ed4cccc9.tar.xz | |
Merge branch 'usb-audio-fix' of git://git.alsa-project.org/alsa-kprivate into for-linus
Diffstat (limited to 'drivers/tty/serial/samsung.c')
| -rw-r--r-- | drivers/tty/serial/samsung.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c index 12e5249d053e..e514b3a4dc57 100644 --- a/drivers/tty/serial/samsung.c +++ b/drivers/tty/serial/samsung.c @@ -1006,7 +1006,6 @@ static void s3c24xx_serial_resetport(struct uart_port *port, ucon &= ucon_mask; wr_regl(port, S3C2410_UCON, ucon | cfg->ucon); - wr_regl(port, S3C2410_ULCON, cfg->ulcon); /* reset both fifos */ wr_regl(port, S3C2410_UFCON, cfg->ufcon | S3C2410_UFCON_RESETBOTH); |