diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-15 18:16:07 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-15 18:16:07 -0400 |
| commit | 2502991560dc8244dbe10e48473d85722c1e2ec1 (patch) | |
| tree | 63b1f3be2ed56ff06f1e8db709e4ce85d69c3add /drivers/char/amiserial.c | |
| parent | 7e69a8c4d06b7ecb874f571e82b715a9f79bc3c4 (diff) | |
| parent | a9ff8f6462635c8d9f8d64b7b10ddcea8404d77b (diff) | |
Merge branch 'fixes' into for-linus
Conflicts:
arch/arm/mach-versatile/core.c
Diffstat (limited to 'drivers/char/amiserial.c')
| -rw-r--r-- | drivers/char/amiserial.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/char/amiserial.c b/drivers/char/amiserial.c index 6e763e3f5a81..98821f97583c 100644 --- a/drivers/char/amiserial.c +++ b/drivers/char/amiserial.c | |||
| @@ -837,9 +837,6 @@ static int rs_put_char(struct tty_struct *tty, unsigned char ch) | |||
| 837 | struct async_struct *info; | 837 | struct async_struct *info; |
| 838 | unsigned long flags; | 838 | unsigned long flags; |
| 839 | 839 | ||
| 840 | if (!tty) | ||
| 841 | return 0; | ||
| 842 | |||
| 843 | info = tty->driver_data; | 840 | info = tty->driver_data; |
| 844 | 841 | ||
| 845 | if (serial_paranoia_check(info, tty->name, "rs_put_char")) | 842 | if (serial_paranoia_check(info, tty->name, "rs_put_char")) |
| @@ -892,9 +889,6 @@ static int rs_write(struct tty_struct * tty, const unsigned char *buf, int count | |||
| 892 | struct async_struct *info; | 889 | struct async_struct *info; |
| 893 | unsigned long flags; | 890 | unsigned long flags; |
| 894 | 891 | ||
| 895 | if (!tty) | ||
| 896 | return 0; | ||
| 897 | |||
| 898 | info = tty->driver_data; | 892 | info = tty->driver_data; |
| 899 | 893 | ||
| 900 | if (serial_paranoia_check(info, tty->name, "rs_write")) | 894 | if (serial_paranoia_check(info, tty->name, "rs_write")) |