git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pcmcia: blackfin: fix bug - add missing ; to MODULE macro
[safe/jmp/linux-2.6]
/
drivers
/
pcmcia
/
pcmcia_ioctl.c
diff --git
a/drivers/pcmcia/pcmcia_ioctl.c
b/drivers/pcmcia/pcmcia_ioctl.c
index
f2352c2
..
1703b20
100644
(file)
--- a/
drivers/pcmcia/pcmcia_ioctl.c
+++ b/
drivers/pcmcia/pcmcia_ioctl.c
@@
-38,7
+38,6
@@
#include <pcmcia/ss.h>
#include "cs_internal.h"
#include <pcmcia/ss.h>
#include "cs_internal.h"
-#include "ds_internal.h"
static int major_dev = -1;
static int major_dev = -1;
@@
-859,10
+858,10
@@
static int ds_ioctl(struct inode * inode, struct file * file,
break;
case DS_PARSE_TUPLE:
buf->tuple.TupleData = buf->tuple_parse.data;
break;
case DS_PARSE_TUPLE:
buf->tuple.TupleData = buf->tuple_parse.data;
- ret = pc
card
_parse_tuple(&buf->tuple, &buf->tuple_parse.parse);
+ ret = pc
mcia
_parse_tuple(&buf->tuple, &buf->tuple_parse.parse);
break;
case DS_RESET_CARD:
break;
case DS_RESET_CARD:
- ret = pc
card
_reset_card(s);
+ ret = pc
mcia
_reset_card(s);
break;
case DS_GET_STATUS:
if (buf->status.Function &&
break;
case DS_GET_STATUS:
if (buf->status.Function &&
@@
-970,8
+969,6
@@
static int ds_ioctl(struct inode * inode, struct file * file,
case -ENOSYS:
err = ret;
break;
case -ENOSYS:
err = ret;
break;
- case CS_BAD_TUPLE:
- err = -EINVAL; break;
case -ENOMEM:
err = -ENOSPC; break;
case -ENOSPC:
case -ENOMEM:
err = -ENOSPC; break;
case -ENOSPC: