patch-2.1.17 linux/arch/m68k/amiga/cyberfb.c

Next file: linux/arch/m68k/amiga/ksyms.c
Previous file: linux/arch/m68k/amiga/config.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.16/linux/arch/m68k/amiga/cyberfb.c linux/arch/m68k/amiga/cyberfb.c
@@ -424,6 +424,7 @@
    fix->xpanstep = 0;
    fix->ypanstep = 0;
    fix->ywrapstep = 0;
+   fix->line_length = 0;
 
    for (i = 0; i < arraysize(fix->reserved); i++)
       fix->reserved[i] = 0;
@@ -896,10 +897,10 @@
          memcpy(to, from, len);
          return;
       case 1:
-         memcpy_fromfs(to, from, len);
+         copy_from_user(to, from, len);
          return;
       case 2:
-         memcpy_tofs(to, from, len);
+         copy_to_user(to, from, len);
          return;
    }
 }

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov