From 6c4881c506abece8c293193c7e25ac815581b496 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Wed, 2 Jun 2010 23:56:13 +0000 Subject: [PATCH] --- yaml --- r: 200155 b: refs/heads/master c: 60a5711db646b87b9530b16cbaf3bd53ac5594a5 h: refs/heads/master i: 200153: ff8b9955cfee9ab3f60a3fb86467c6deb2ce1d2f 200151: 4ed28fd4966cab390e19f522f3af73638c85a0b0 v: v3 --- [refs] | 2 +- trunk/drivers/isdn/capi/kcapi.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 7d3976c98efb..e719e123e1f1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3b21b508ecc9e043839a5337563cfc77f9fcedb9 +refs/heads/master: 60a5711db646b87b9530b16cbaf3bd53ac5594a5 diff --git a/trunk/drivers/isdn/capi/kcapi.c b/trunk/drivers/isdn/capi/kcapi.c index bde3c88b8b27..b054494df846 100644 --- a/trunk/drivers/isdn/capi/kcapi.c +++ b/trunk/drivers/isdn/capi/kcapi.c @@ -1020,12 +1020,12 @@ static int old_capi_manufacturer(unsigned int cmd, void __user *data) if (cmd == AVMB1_ADDCARD) { if ((retval = copy_from_user(&cdef, data, sizeof(avmb1_carddef)))) - return retval; + return -EFAULT; cdef.cardtype = AVM_CARDTYPE_B1; } else { if ((retval = copy_from_user(&cdef, data, sizeof(avmb1_extcarddef)))) - return retval; + return -EFAULT; } cparams.port = cdef.port; cparams.irq = cdef.irq; @@ -1218,7 +1218,7 @@ int capi20_manufacturer(unsigned int cmd, void __user *data) kcapi_carddef cdef; if ((retval = copy_from_user(&cdef, data, sizeof(cdef)))) - return retval; + return -EFAULT; cparams.port = cdef.port; cparams.irq = cdef.irq;