Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / isdn / hisax / isar.c

diff --git a/drivers/isdn/hisax/isar.c b/drivers/isdn/hisax/isar.c
index 2e72227bd071b9d18329e60a0e4b06a444700ec9..d4cce337add2877da0e0e14a4244e149d97701c2 100644 (file)
--- a/drivers/isdn/hisax/isar.c
+++ b/drivers/isdn/hisax/isar.c
@@ -189,7 +189,7 @@ ISARVersion(struct IsdnCardState *cs, char *s)
 static int
 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_short sadr, left, *sp;
        u_char __user *p = buf;
@@ -212,9 +212,10 @@ 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)))) {
-               printk(KERN_ERR"isar_load_firmware copy_from_user ret %d\n", ret);
-               return ret;
+       cfu_ret = copy_from_user(&size, p, sizeof(int));
+       if (cfu_ret) {
+               printk(KERN_ERR"isar_load_firmware copy_from_user ret %d\n", cfu_ret);
+               return -EFAULT;
        }
        p += sizeof(int);
        printk(KERN_DEBUG"isar_load_firmware size: %d\n", size);
@@ -953,7 +954,7 @@ isar_pump_statev_modem(struct BCState *bcs, u_char devt) {
                        break;
                case PSEV_GSTN_CLR:
                        if (cs->debug & L1_DEB_HSCX)
-                               debugl1(cs, "pump stev GSTN CLEAR", devt);
+                               debugl1(cs, "pump stev GSTN CLEAR");
                        break;
                default:
                        if (cs->debug & L1_DEB_HSCX)
@@ -1268,7 +1269,7 @@ isar_int_main(struct IsdnCardState *cs)
 static void
 ftimer_handler(struct BCState *bcs) {
        if (bcs->cs->debug)
-               debugl1(bcs->cs, "ftimer flags %04x",
+               debugl1(bcs->cs, "ftimer flags %04lx",
                        bcs->Flag);
        test_and_clear_bit(BC_FLG_FTI_RUN, &bcs->Flag);
        if (test_and_clear_bit(BC_FLG_LL_CONN, &bcs->Flag)) {
@@ -1748,7 +1749,7 @@ isar_auxcmd(struct IsdnCardState *cs, isdn_ctrl *ic) {
        struct BCState *bcs;
 
        if (cs->debug & L1_DEB_HSCX)
-               debugl1(cs, "isar_auxcmd cmd/ch %x/%d", ic->command, ic->arg);
+               debugl1(cs, "isar_auxcmd cmd/ch %x/%ld", ic->command, ic->arg);
        switch (ic->command) {
                case (ISDN_CMD_FAXCMD):
                        bcs = cs->channel[ic->arg].bcs;