diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 06:58:59 +0100 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 06:58:59 +0100 |
commit | cac0e8e8bb2e7a086643bdd00c41d900a79bb4fa (patch) | |
tree | 73cd85e5529a01fa2338ab6d58b99c36dd666cbe /drivers/char/rocket.c | |
parent | [libata sata_mv] do not enable PCI MSI by default (diff) | |
parent | Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/... (diff) | |
download | linux-cac0e8e8bb2e7a086643bdd00c41d900a79bb4fa.tar.xz linux-cac0e8e8bb2e7a086643bdd00c41d900a79bb4fa.zip |
Merge branch 'master'
Diffstat (limited to 'drivers/char/rocket.c')
-rw-r--r-- | drivers/char/rocket.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/rocket.c b/drivers/char/rocket.c index 0949dcef0697..7edc6a4dbdc4 100644 --- a/drivers/char/rocket.c +++ b/drivers/char/rocket.c @@ -433,7 +433,7 @@ static void rp_do_receive(struct r_port *info, count += ToRecv; } /* Push the data up to the tty layer */ - ld->receive_buf(tty, cbuf, fbuf, count); + ld->receive_buf(tty, chead, fhead, count); done: tty_ldisc_deref(ld); } |