projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm...
[linux-2.6-block.git]
/
drivers
/
tty
/
amiserial.c
diff --git
a/drivers/tty/amiserial.c
b/drivers/tty/amiserial.c
index 208f573495dcab3efdad85fcbdcd32809102c192..dfbb974927f289095cccedb06d0d3db73dbfbdee 100644
(file)
--- a/
drivers/tty/amiserial.c
+++ b/
drivers/tty/amiserial.c
@@
-1012,8
+1012,6
@@
static int get_serial_info(struct tty_struct *tty, struct serial_state *state,
{
struct serial_struct tmp;
{
struct serial_struct tmp;
- if (!retinfo)
- return -EFAULT;
memset(&tmp, 0, sizeof(tmp));
tty_lock(tty);
tmp.line = tty->index;
memset(&tmp, 0, sizeof(tmp));
tty_lock(tty);
tmp.line = tty->index;