aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia/pcmcia_ioctl.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/pcmcia/pcmcia_ioctl.c')
-rw-r--r--drivers/pcmcia/pcmcia_ioctl.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/pcmcia/pcmcia_ioctl.c b/drivers/pcmcia/pcmcia_ioctl.c
index e27c71ebfda2..99563134ac0f 100644
--- a/drivers/pcmcia/pcmcia_ioctl.c
+++ b/drivers/pcmcia/pcmcia_ioctl.c
@@ -149,7 +149,7 @@ static int adjust_irq(struct pcmcia_socket *s, adjust_t *adj)
149 149
150 irq = adj->resource.irq.IRQ; 150 irq = adj->resource.irq.IRQ;
151 if ((irq < 0) || (irq > 15)) 151 if ((irq < 0) || (irq > 15))
152 return CS_BAD_IRQ; 152 return -EINVAL;
153 153
154 if (adj->Action != REMOVE_MANAGED_RESOURCE) 154 if (adj->Action != REMOVE_MANAGED_RESOURCE)
155 return 0; 155 return 0;
@@ -970,8 +970,7 @@ static int ds_ioctl(struct inode * inode, struct file * file,
970 case -ENOSYS: 970 case -ENOSYS:
971 err = ret; 971 err = ret;
972 break; 972 break;
973 case CS_BAD_ARGS: case CS_BAD_IRQ: 973 case CS_BAD_ARGS: case CS_BAD_TUPLE:
974 case CS_BAD_TUPLE:
975 err = -EINVAL; break; 974 err = -EINVAL; break;
976 case -ENOMEM: 975 case -ENOMEM:
977 err = -ENOSPC; break; 976 err = -ENOSPC; break;