From d69b222e1c0d49cd0b7042f3a3136e632565aef1 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Fri, 10 Dec 2010 02:40:09 +0000 Subject: [PATCH] --- yaml --- r: 224989 b: refs/heads/master c: 36accaed22347f4b09cbc3c9fe2c1163a3575ea1 h: refs/heads/master i: 224987: 8b5d33f8bce6e65bd42d19a6c5db18269f6f2fb1 v: v3 --- [refs] | 2 +- trunk/drivers/isdn/hisax/isar.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0854f27720f5..bfdb04160044 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5d52040d4d1eabb56a4d51b760ab8f74eabb9001 +refs/heads/master: 36accaed22347f4b09cbc3c9fe2c1163a3575ea1 diff --git a/trunk/drivers/isdn/hisax/isar.c b/trunk/drivers/isdn/hisax/isar.c index 1be4552d94b4..c9cd4d22b4a5 100644 --- a/trunk/drivers/isdn/hisax/isar.c +++ b/trunk/drivers/isdn/hisax/isar.c @@ -212,9 +212,9 @@ isar_load_firmware(struct IsdnCardState *cs, u_char __user *buf) cs->debug &= ~(L1_DEB_HSCX | L1_DEB_HSCX_FIFO); #endif - if ((ret = copy_from_user(&size, p, sizeof(int)))) { + if (copy_from_user(&size, p, sizeof(int))) { printk(KERN_ERR"isar_load_firmware copy_from_user ret %d\n", ret); - return ret; + return -EFAULT; } p += sizeof(int); printk(KERN_DEBUG"isar_load_firmware size: %d\n", size);