diff options
| author | David S. Miller <davem@davemloft.net> | 2014-01-14 17:37:09 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-01-14 17:42:42 -0500 |
| commit | 0a379e21c503b2ff66b44d588df9f231e9b0b9ca (patch) | |
| tree | 22b875fcf4b67fcd007726f00c5fc1748ce985d0 /drivers/s390 | |
| parent | a49da8811e71c5355b52c65ee32976741d5834cd (diff) | |
| parent | fdc3452cd2c7b2bfe0f378f92123f4f9a98fa2bd (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/s390')
| -rw-r--r-- | drivers/s390/char/tty3270.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/char/tty3270.c b/drivers/s390/char/tty3270.c index 3f4ca4e09a4c..34629ea913d4 100644 --- a/drivers/s390/char/tty3270.c +++ b/drivers/s390/char/tty3270.c | |||
| @@ -942,7 +942,7 @@ static int tty3270_install(struct tty_driver *driver, struct tty_struct *tty) | |||
| 942 | return rc; | 942 | return rc; |
| 943 | } | 943 | } |
| 944 | 944 | ||
| 945 | tp->screen = tty3270_alloc_screen(tp->view.cols, tp->view.rows); | 945 | tp->screen = tty3270_alloc_screen(tp->view.rows, tp->view.cols); |
| 946 | if (IS_ERR(tp->screen)) { | 946 | if (IS_ERR(tp->screen)) { |
| 947 | rc = PTR_ERR(tp->screen); | 947 | rc = PTR_ERR(tp->screen); |
| 948 | raw3270_put_view(&tp->view); | 948 | raw3270_put_view(&tp->view); |