Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[pandora-kernel.git] / drivers / video / udlfb.c

diff --git a/drivers/video/udlfb.c b/drivers/video/udlfb.c
index 74a679e..2c8364e 100644 (file)
--- a/drivers/video/udlfb.c
+++ b/drivers/video/udlfb.c
@@ -1128,14 +1128,13 @@ static int dlfb_realloc_framebuffer(struct dlfb_data *dev, struct fb_info *info)
                 * But with imperfect damage info we may send pixels over USB
                 * that were, in fact, unchanged - wasting limited USB bandwidth
                 */
-               new_back = vmalloc(new_len);
+               new_back = vzalloc(new_len);
                if (!new_back)
-                       pr_info("No shadow/backing buffer allcoated\n");
+                       pr_info("No shadow/backing buffer allocated\n");
                else {
                        if (dev->backing_buffer)
                                vfree(dev->backing_buffer);
                        dev->backing_buffer = new_back;
-                       memset(dev->backing_buffer, 0, new_len);
                }
        }
 
@@ -1404,7 +1403,7 @@ static struct device_attribute fb_device_attrs[] = {
        __ATTR_RO(metrics_bytes_identical),
        __ATTR_RO(metrics_bytes_sent),
        __ATTR_RO(metrics_cpu_kcycles_used),
-       __ATTR(metrics_reset, S_IWUGO, NULL, metrics_reset_store),
+       __ATTR(metrics_reset, S_IWUSR, NULL, metrics_reset_store),
 };
 
 /*