Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-09 23:39:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[PATCH] pcmcia: fix ioctl for GET_STATUS and GET_CONFIGURATION_INFO

Browse Source 
the p_dev == NULL checks are wrong.  the called functions handle a NULL
p_dev on their own.  w/o this patch output of cardcctl status and cardctl
config is broken for cardbus cards or when the slot is empty.

Signed-off-by: Daniel Ritz <daniel.ritz@gmx.ch>
Cc: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Daniel Ritz 2006-07-30 03:03:47 -07:00 committed by Linus Torvalds
parent 7ca7b5c42e
commit f47ad21492
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/pcmcia/pcmcia_ioctl.c
View File

@ -601,12 +601,8 @@ static int ds_ioctl(struct inode * inode, struct file * file,
ret = CS_BAD_ARGS; ret = CS_BAD_ARGS;
else { else {
struct pcmcia_device *p_dev = get_pcmcia_device(s, buf->config.Function); struct pcmcia_device *p_dev = get_pcmcia_device(s, buf->config.Function);
if (p_dev == NULL) ret = pccard_get_configuration_info(s, p_dev, &buf->config);
ret = CS_BAD_ARGS; pcmcia_put_dev(p_dev);
else {
ret = pccard_get_configuration_info(s, p_dev, &buf->config);
pcmcia_put_dev(p_dev);
}
} }
break; break;
case DS_GET_FIRST_TUPLE: case DS_GET_FIRST_TUPLE:
@ -636,12 +632,8 @@ static int ds_ioctl(struct inode * inode, struct file * file,
ret = CS_BAD_ARGS; ret = CS_BAD_ARGS;
else { else {
struct pcmcia_device *p_dev = get_pcmcia_device(s, buf->status.Function); struct pcmcia_device *p_dev = get_pcmcia_device(s, buf->status.Function);
if (p_dev == NULL) ret = pccard_get_status(s, p_dev, &buf->status);
ret = CS_BAD_ARGS; pcmcia_put_dev(p_dev);
else {
ret = pccard_get_status(s, p_dev, &buf->status);
pcmcia_put_dev(p_dev);
}
} }
break; break;
case DS_VALIDATE_CIS: case DS_VALIDATE_CIS: