git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
drivers
/
isdn
/
sc
/
ioctl.c
diff --git
a/drivers/isdn/sc/ioctl.c
b/drivers/isdn/sc/ioctl.c
index
1371a99
..
70e0faa
100644
(file)
--- a/
drivers/isdn/sc/ioctl.c
+++ b/
drivers/isdn/sc/ioctl.c
@@
-72,7
+72,7
@@
int sc_ioctl(int card, scs_ioctl *data)
/*
* Get the SRec from user space
*/
/*
* Get the SRec from user space
*/
- if (copy_from_user(srec, data->dataptr, sizeof(srec))) {
+ if (copy_from_user(srec,
(char *)
data->dataptr, sizeof(srec))) {
kfree(rcvmsg);
kfree(srec);
return -EFAULT;
kfree(rcvmsg);
kfree(srec);
return -EFAULT;
@@
-118,7
+118,8
@@
int sc_ioctl(int card, scs_ioctl *data)
/*
* Get the switch type from user space
*/
/*
* Get the switch type from user space
*/
- if (copy_from_user(&switchtype, data->dataptr, sizeof(char))) {
+ if (copy_from_user(&switchtype, (char *)data->dataptr,
+ sizeof(char))) {
kfree(rcvmsg);
return -EFAULT;
}
kfree(rcvmsg);
return -EFAULT;
}
@@
-151,7
+152,7
@@
int sc_ioctl(int card, scs_ioctl *data)
* Get the switch type from the board
*/
status = send_and_receive(card, CEPID, ceReqTypeCall, ceReqClass0,
* Get the switch type from the board
*/
status = send_and_receive(card, CEPID, ceReqTypeCall, ceReqClass0,
- ceReqCallGetSwitchType, 0, 0,
NULL
, rcvmsg, SAR_TIMEOUT);
+ ceReqCallGetSwitchType, 0, 0,
0
, rcvmsg, SAR_TIMEOUT);
if (!status && !(rcvmsg->rsp_status)) {
pr_debug("%s: SCIOCGETSWITCH: command successful\n",
sc_adapter[card]->devicename);
if (!status && !(rcvmsg->rsp_status)) {
pr_debug("%s: SCIOCGETSWITCH: command successful\n",
sc_adapter[card]->devicename);
@@
-168,7
+169,7
@@
int sc_ioctl(int card, scs_ioctl *data)
/*
* Package the switch type and send to user space
*/
/*
* Package the switch type and send to user space
*/
- if (copy_to_user(data->dataptr, &switchtype,
+ if (copy_to_user(
(char *)
data->dataptr, &switchtype,
sizeof(char))) {
kfree(rcvmsg);
return -EFAULT;
sizeof(char))) {
kfree(rcvmsg);
return -EFAULT;
@@
-192,7
+193,7
@@
int sc_ioctl(int card, scs_ioctl *data)
* Get the spid from the board
*/
status = send_and_receive(card, CEPID, ceReqTypeCall, ceReqClass0, ceReqCallGetSPID,
* Get the spid from the board
*/
status = send_and_receive(card, CEPID, ceReqTypeCall, ceReqClass0, ceReqCallGetSPID,
- data->channel, 0,
NULL
, rcvmsg, SAR_TIMEOUT);
+ data->channel, 0,
0
, rcvmsg, SAR_TIMEOUT);
if (!status) {
pr_debug("%s: SCIOCGETSPID: command successful\n",
sc_adapter[card]->devicename);
if (!status) {
pr_debug("%s: SCIOCGETSPID: command successful\n",
sc_adapter[card]->devicename);
@@
-208,7
+209,7
@@
int sc_ioctl(int card, scs_ioctl *data)
/*
* Package the switch type and send to user space
*/
/*
* Package the switch type and send to user space
*/
- if (copy_to_user(data->dataptr, spid, SCIOC_SPIDSIZE)) {
+ if (copy_to_user(
(char *)
data->dataptr, spid, SCIOC_SPIDSIZE)) {
kfree(spid);
kfree(rcvmsg);
return -EFAULT;
kfree(spid);
kfree(rcvmsg);
return -EFAULT;
@@
-233,7
+234,7
@@
int sc_ioctl(int card, scs_ioctl *data)
/*
* Get the spid from user space
*/
/*
* Get the spid from user space
*/
- if (copy_from_user(spid, data->dataptr, SCIOC_SPIDSIZE)) {
+ if (copy_from_user(spid,
(char *)
data->dataptr, SCIOC_SPIDSIZE)) {
kfree(rcvmsg);
return -EFAULT;
}
kfree(rcvmsg);
return -EFAULT;
}
@@
-268,7
+269,7
@@
int sc_ioctl(int card, scs_ioctl *data)
* Get the dn from the board
*/
status = send_and_receive(card, CEPID, ceReqTypeCall, ceReqClass0, ceReqCallGetMyNumber,
* Get the dn from the board
*/
status = send_and_receive(card, CEPID, ceReqTypeCall, ceReqClass0, ceReqCallGetMyNumber,
- data->channel, 0,
NULL
, rcvmsg, SAR_TIMEOUT);
+ data->channel, 0,
0
, rcvmsg, SAR_TIMEOUT);
if (!status) {
pr_debug("%s: SCIOCGETDN: command successful\n",
sc_adapter[card]->devicename);
if (!status) {
pr_debug("%s: SCIOCGETDN: command successful\n",
sc_adapter[card]->devicename);
@@
-291,7
+292,7
@@
int sc_ioctl(int card, scs_ioctl *data)
/*
* Package the dn and send to user space
*/
/*
* Package the dn and send to user space
*/
- if (copy_to_user(data->dataptr, dn, SCIOC_DNSIZE)) {
+ if (copy_to_user(
(char *)
data->dataptr, dn, SCIOC_DNSIZE)) {
kfree(dn);
return -EFAULT;
}
kfree(dn);
return -EFAULT;
}
@@
-312,7
+313,7
@@
int sc_ioctl(int card, scs_ioctl *data)
/*
* Get the spid from user space
*/
/*
* Get the spid from user space
*/
- if (copy_from_user(dn, data->dataptr, SCIOC_DNSIZE)) {
+ if (copy_from_user(dn,
(char *)
data->dataptr, SCIOC_DNSIZE)) {
kfree(rcvmsg);
kfree(dn);
return -EFAULT;
kfree(rcvmsg);
kfree(dn);
return -EFAULT;
@@
-365,7
+366,8
@@
int sc_ioctl(int card, scs_ioctl *data)
kfree(rcvmsg);
GetStatus(card, bi);
kfree(rcvmsg);
GetStatus(card, bi);
- if (copy_to_user(data->dataptr, bi, sizeof(boardInfo))) {
+ if (copy_to_user((boardInfo *)data->dataptr, bi,
+ sizeof(boardInfo))) {
kfree(bi);
return -EFAULT;
}
kfree(bi);
return -EFAULT;
}
@@
-383,7
+385,7
@@
int sc_ioctl(int card, scs_ioctl *data)
* Get the speed from the board
*/
status = send_and_receive(card, CEPID, ceReqTypeCall, ceReqClass0,
* Get the speed from the board
*/
status = send_and_receive(card, CEPID, ceReqTypeCall, ceReqClass0,
- ceReqCallGetCallType, data->channel, 0,
NULL
, rcvmsg, SAR_TIMEOUT);
+ ceReqCallGetCallType, data->channel, 0,
0
, rcvmsg, SAR_TIMEOUT);
if (!status && !(rcvmsg->rsp_status)) {
pr_debug("%s: SCIOCGETSPEED: command successful\n",
sc_adapter[card]->devicename);
if (!status && !(rcvmsg->rsp_status)) {
pr_debug("%s: SCIOCGETSPEED: command successful\n",
sc_adapter[card]->devicename);
@@
-403,7
+405,7
@@
int sc_ioctl(int card, scs_ioctl *data)
* Package the switch type and send to user space
*/
* Package the switch type and send to user space
*/
- if (copy_to_user(data->dataptr, &speed, sizeof(char)))
+ if (copy_to_user(
(char *)
data->dataptr, &speed, sizeof(char)))
return -EFAULT;
return 0;
return -EFAULT;
return 0;