From ff6f034ad4fc2fc07a8a5261394dc9dc26123024 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Mon, 13 Oct 2008 10:45:17 +0100 Subject: [PATCH] --- yaml --- r: 113478 b: refs/heads/master c: a7be18d436f0c7007794965e5af29fa1ffff1e05 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/char/applicom.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 873f1777a785..ab6637d105bb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 17b820606e7bdd3be31b001265d0177423fea5eb +refs/heads/master: a7be18d436f0c7007794965e5af29fa1ffff1e05 diff --git a/trunk/drivers/char/applicom.c b/trunk/drivers/char/applicom.c index 31d08b641f5b..b899d9182c7d 100644 --- a/trunk/drivers/char/applicom.c +++ b/trunk/drivers/char/applicom.c @@ -712,8 +712,7 @@ static int ac_ioctl(struct inode *inode, struct file *file, unsigned int cmd, un IndexCard = adgl->num_card-1; - if(cmd != 0 && cmd != 6 && - ((IndexCard >= MAX_BOARD) || !apbs[IndexCard].RamIO)) { + if(cmd != 6 && ((IndexCard >= MAX_BOARD) || !apbs[IndexCard].RamIO)) { static int warncount = 10; if (warncount) { printk( KERN_WARNING "APPLICOM driver IOCTL, bad board number %d\n",(int)IndexCard+1); @@ -832,8 +831,7 @@ static int ac_ioctl(struct inode *inode, struct file *file, unsigned int cmd, un } break; default: - printk(KERN_INFO "APPLICOM driver ioctl, unknown function code %d\n",cmd) ; - ret = -EINVAL; + ret = -ENOTTY; break; } Dummy = readb(apbs[IndexCard].RamIO + VERS);