diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-09-16 01:33:21 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-09-16 01:33:21 -0400 |
| commit | c91925db4925ba0d145478f02c093369196936e9 (patch) | |
| tree | 0e5da4211de3c18b65337c3094ec15994cf2534a /drivers/char/tty_io.c | |
| parent | 977ddd6b2e63716cfefe669bbdb30ec0bcea1fe4 (diff) | |
| parent | 3894335876a6257ac46e14845bd37ae6fb0f7c87 (diff) | |
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'drivers/char/tty_io.c')
| -rw-r--r-- | drivers/char/tty_io.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c index 949067a0bd47..613c852ee0fe 100644 --- a/drivers/char/tty_io.c +++ b/drivers/char/tty_io.c | |||
| @@ -355,7 +355,7 @@ struct tty_driver *tty_find_polling_driver(char *name, int *line) | |||
| 355 | if (*stp == '\0') | 355 | if (*stp == '\0') |
| 356 | stp = NULL; | 356 | stp = NULL; |
| 357 | 357 | ||
| 358 | if (tty_line >= 0 && tty_line <= p->num && p->ops && | 358 | if (tty_line >= 0 && tty_line < p->num && p->ops && |
| 359 | p->ops->poll_init && !p->ops->poll_init(p, tty_line, stp)) { | 359 | p->ops->poll_init && !p->ops->poll_init(p, tty_line, stp)) { |
| 360 | res = tty_driver_kref_get(p); | 360 | res = tty_driver_kref_get(p); |
| 361 | *line = tty_line; | 361 | *line = tty_line; |