diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-08-03 17:20:37 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-03 17:20:37 -0400 |
| commit | 23946a8a980d13af7b84bcf3ce023e0d166ec83f (patch) | |
| tree | 193d2959a7b62b48aaf2236447f1378779e55104 /drivers/pcmcia/pcmcia_ioctl.c | |
| parent | 66e8bb97055ff22a0e5ea89c0a75a35f8738cc96 (diff) | |
| parent | 2b14c30b46e007a16c665cc86329bf4a1d9ff6ee (diff) | |
| download | talos-op-linux-23946a8a980d13af7b84bcf3ce023e0d166ec83f.tar.gz talos-op-linux-23946a8a980d13af7b84bcf3ce023e0d166ec83f.zip | |
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'drivers/pcmcia/pcmcia_ioctl.c')
| -rw-r--r-- | drivers/pcmcia/pcmcia_ioctl.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/drivers/pcmcia/pcmcia_ioctl.c b/drivers/pcmcia/pcmcia_ioctl.c index 738b1ef595a3..9ad18e62658d 100644 --- a/drivers/pcmcia/pcmcia_ioctl.c +++ b/drivers/pcmcia/pcmcia_ioctl.c @@ -601,12 +601,8 @@ static int ds_ioctl(struct inode * inode, struct file * file, ret = CS_BAD_ARGS; else { struct pcmcia_device *p_dev = get_pcmcia_device(s, buf->config.Function); - if (p_dev == NULL) - ret = CS_BAD_ARGS; - else { - ret = pccard_get_configuration_info(s, p_dev, &buf->config); - pcmcia_put_dev(p_dev); - } + ret = pccard_get_configuration_info(s, p_dev, &buf->config); + pcmcia_put_dev(p_dev); } break; case DS_GET_FIRST_TUPLE: @@ -636,12 +632,8 @@ static int ds_ioctl(struct inode * inode, struct file * file, ret = CS_BAD_ARGS; else { struct pcmcia_device *p_dev = get_pcmcia_device(s, buf->status.Function); - if (p_dev == NULL) - ret = CS_BAD_ARGS; - else { - ret = pccard_get_status(s, p_dev, &buf->status); - pcmcia_put_dev(p_dev); - } + ret = pccard_get_status(s, p_dev, &buf->status); + pcmcia_put_dev(p_dev); } break; case DS_VALIDATE_CIS: |
