From a9ece77a2de04a1267f2895f25b3882044ed1258 Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Thu, 25 Dec 2008 18:03:28 -0800 Subject: [PATCH] --- yaml --- r: 122872 b: refs/heads/master c: 90f5dfcc6afafcc3e1c18298143c1213b071990d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ppp_async.c | 6 ------ trunk/drivers/net/ppp_synctty.c | 6 ------ 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/[refs] b/[refs] index af9a5caa02f9..e8793d72774f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 662f44af635f6bde366d44abacaeec7916d9f168 +refs/heads/master: 90f5dfcc6afafcc3e1c18298143c1213b071990d diff --git a/trunk/drivers/net/ppp_async.c b/trunk/drivers/net/ppp_async.c index 451bdb57d6fc..6567fabd2e13 100644 --- a/trunk/drivers/net/ppp_async.c +++ b/trunk/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; diff --git a/trunk/drivers/net/ppp_synctty.c b/trunk/drivers/net/ppp_synctty.c index 801d8f99d471..1e892b7b1f8c 100644 --- a/trunk/drivers/net/ppp_synctty.c +++ b/trunk/drivers/net/ppp_synctty.c @@ -333,9 +333,6 @@ ppp_synctty_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; @@ -343,9 +340,6 @@ ppp_synctty_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;