diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-06-30 00:49:18 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-30 00:49:18 -0400 |
| commit | 0c168775709faa74c1b87f1e61046e0c51ade7f3 (patch) | |
| tree | c40fd8818c64c5d7d1d90afab0bd6ffd94505526 /drivers/char/tty_ioctl.c | |
| parent | 9bd481f85940726bf66aae5cd03c5b912ad0ae4c (diff) | |
| parent | 9b4311eedb17fa88f02e4876cd6aa9a08e383cd6 (diff) | |
Merge upstream 2.6.13-rc1-git1 into 'ieee80211' branch of netdev-2.6.
Diffstat (limited to 'drivers/char/tty_ioctl.c')
| -rw-r--r-- | drivers/char/tty_ioctl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/tty_ioctl.c b/drivers/char/tty_ioctl.c index 58597993954f..f19cf9d7792d 100644 --- a/drivers/char/tty_ioctl.c +++ b/drivers/char/tty_ioctl.c | |||
| @@ -476,11 +476,11 @@ int n_tty_ioctl(struct tty_struct * tty, struct file * file, | |||
| 476 | ld = tty_ldisc_ref(tty); | 476 | ld = tty_ldisc_ref(tty); |
| 477 | switch (arg) { | 477 | switch (arg) { |
| 478 | case TCIFLUSH: | 478 | case TCIFLUSH: |
| 479 | if (ld->flush_buffer) | 479 | if (ld && ld->flush_buffer) |
| 480 | ld->flush_buffer(tty); | 480 | ld->flush_buffer(tty); |
| 481 | break; | 481 | break; |
| 482 | case TCIOFLUSH: | 482 | case TCIOFLUSH: |
| 483 | if (ld->flush_buffer) | 483 | if (ld && ld->flush_buffer) |
| 484 | ld->flush_buffer(tty); | 484 | ld->flush_buffer(tty); |
| 485 | /* fall through */ | 485 | /* fall through */ |
| 486 | case TCOFLUSH: | 486 | case TCOFLUSH: |