1 files changed, 5 insertions, 2 deletions

diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 2222de6ad844..d2e19f6dd72c 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -80,10 +80,12 @@ EXPORT_SYMBOL(fb_get_color_depth);
  */
 void fb_pad_aligned_buffer(u8 *dst, u32 d_pitch, u8 *src, u32 s_pitch, u32 height)
 {
-        int i;
+        int i, j;
 
         for (i = height; i--; ) {
-                memcpy(dst, src, s_pitch);
+                /* s_pitch is a few bytes at the most, memcpy is suboptimal */
+                for (j = 0; j < s_pitch; j++)
+                        dst[j] = src[j];
                 src += s_pitch;
                 dst += d_pitch;
         }
@@ -1164,6 +1166,7 @@ static void __exit
 fbmem_exit(void)
 {
         class_destroy(fb_class);
+        unregister_chrdev(FB_MAJOR, "fb");
 }
 
 module_exit(fbmem_exit);