diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-29 09:42:58 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-29 10:37:07 +0100 |
| commit | 0ce74d9296c971b2355c26984ad0bc538e34dd6c (patch) | |
| tree | 566d03e2a4f6b42dab9628cd82c93cd61d587467 /drivers/net/ppp_async.c | |
| parent | 1cc4fff0b360aeffeedb7d6db5089d88dd861700 (diff) | |
| parent | 3c92ec8ae91ecf59d88c798301833d7cf83f2179 (diff) | |
| download | kernel-crypto-0ce74d9296c971b2355c26984ad0bc538e34dd6c.tar.gz kernel-crypto-0ce74d9296c971b2355c26984ad0bc538e34dd6c.tar.xz kernel-crypto-0ce74d9296c971b2355c26984ad0bc538e34dd6c.zip | |
Merge branch 'linus' into timers/hrtimers
Conflicts:
sound/drivers/pcsp/pcsp.c
Semantic conflict:
sound/core/hrtimer.c
Diffstat (limited to 'drivers/net/ppp_async.c')
| -rw-r--r-- | drivers/net/ppp_async.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/ppp_async.c b/drivers/net/ppp_async.c index 451bdb57d6f..6567fabd2e1 100644 --- a/drivers/net/ppp_async.c +++ b/drivers/net/ppp_async.c @@ -293,9 +293,6 @@ ppp_asynctty_ioctl(struct tty_struct *tty, struct file *file, err = -EFAULT; switch (cmd) { case PPPIOCGCHAN: - err = -ENXIO; - if (!ap) - break; err = -EFAULT; if (put_user(ppp_channel_index(&ap->chan), p)) break; @@ -303,9 +300,6 @@ ppp_asynctty_ioctl(struct tty_struct *tty, struct file *file, break; case PPPIOCGUNIT: - err = -ENXIO; - if (!ap) - break; err = -EFAULT; if (put_user(ppp_unit_number(&ap->chan), p)) break; |