lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

isdn: Fix printed out copy_from_user() return value after previous change.

Browse Source 
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
2010-12-10 16:49:24 -08:00
parent f073c7ca29
commit a5d62a149b
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/isdn/hisax/isar.c
View File

@@ -189,7 +189,7 @@ ISARVersion(struct IsdnCardState *cs, char *s)
static int static int
isar_load_firmware(struct IsdnCardState *cs, u_char __user *buf) isar_load_firmware(struct IsdnCardState *cs, u_char __user *buf)
{ {
int ret, size, cnt, debug; int cfu_ret, ret, size, cnt, debug;
u_char len, nom, noc; u_char len, nom, noc;
u_short sadr, left, *sp; u_short sadr, left, *sp;
u_char __user *p = buf; u_char __user *p = buf;
@@ -212,8 +212,9 @@ isar_load_firmware(struct IsdnCardState *cs, u_char __user *buf)
cs->debug &= ~(L1_DEB_HSCX | L1_DEB_HSCX_FIFO); cs->debug &= ~(L1_DEB_HSCX | L1_DEB_HSCX_FIFO);
#endif #endif
if (copy_from_user(&size, p, sizeof(int))) { cfu_ret = copy_from_user(&size, p, sizeof(int));
printk(KERN_ERR"isar_load_firmware copy_from_user ret %d\n", ret); if (cfu_ret) {
printk(KERN_ERR"isar_load_firmware copy_from_user ret %d\n", cfu_ret);
return -EFAULT; return -EFAULT;
} }
p += sizeof(int); p += sizeof(int);