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
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
drivers
/
isdn
/
act2000
/
act2000_isa.c
diff --git
a/drivers/isdn/act2000/act2000_isa.c
b/drivers/isdn/act2000/act2000_isa.c
index
662a61e
..
e84aa5f
100644
(file)
--- a/
drivers/isdn/act2000/act2000_isa.c
+++ b/
drivers/isdn/act2000/act2000_isa.c
@@
-405,7
+405,7
@@
act2000_isa_getid(act2000_card * card)
* Download microcode into card, check Firmware signature.
*/
int
* Download microcode into card, check Firmware signature.
*/
int
-act2000_isa_download(act2000_card * card, act2000_ddef * cb)
+act2000_isa_download(act2000_card * card, act2000_ddef
__user
* cb)
{
unsigned int length;
int ret;
{
unsigned int length;
int ret;
@@
-413,18
+413,18
@@
act2000_isa_download(act2000_card * card, act2000_ddef * cb)
int c;
long timeout;
u_char *b;
int c;
long timeout;
u_char *b;
- u_char *p;
+ u_char
__user
*p;
u_char *buf;
act2000_ddef cblock;
if (!act2000_isa_reset(card->port))
return -ENXIO;
act2000_isa_delay(HZ / 2);
u_char *buf;
act2000_ddef cblock;
if (!act2000_isa_reset(card->port))
return -ENXIO;
act2000_isa_delay(HZ / 2);
- if(copy_from_user(&cblock,
(char *)
cb, sizeof(cblock)))
+ if(copy_from_user(&cblock, cb, sizeof(cblock)))
return -EFAULT;
length = cblock.length;
p = cblock.buffer;
return -EFAULT;
length = cblock.length;
p = cblock.buffer;
- if ((ret = verify_area(VERIFY_READ,
(void *)
p, length)))
+ if ((ret = verify_area(VERIFY_READ, p, length)))
return ret;
buf = (u_char *) kmalloc(1024, GFP_KERNEL);
if (!buf)
return ret;
buf = (u_char *) kmalloc(1024, GFP_KERNEL);
if (!buf)