Merge branch 'afs-dh' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-block.git] / drivers / video / fbdev / au1100fb.c

diff --git a/drivers/video/fbdev/au1100fb.c b/drivers/video/fbdev/au1100fb.c
index 8de42f617d16792840515655b9457500ff5d4286..7c9a672e9811758f378a328790d5aeae3faf383b 100644 (file)
--- a/drivers/video/fbdev/au1100fb.c
+++ b/drivers/video/fbdev/au1100fb.c
@@ -410,18 +410,15 @@ static int au1100fb_setup(struct au1100fb_device *fbdev)
 
 static int au1100fb_drv_probe(struct platform_device *dev)
 {
-       struct au1100fb_device *fbdev = NULL;
+       struct au1100fb_device *fbdev;
        struct resource *regs_res;
        unsigned long page;
        struct clk *c;
 
        /* Allocate new device private */
-       fbdev = devm_kzalloc(&dev->dev, sizeof(struct au1100fb_device),
-                            GFP_KERNEL);
-       if (!fbdev) {
-               print_err("fail to allocate device private record");
+       fbdev = devm_kzalloc(&dev->dev, sizeof(*fbdev), GFP_KERNEL);
+       if (!fbdev)
                return -ENOMEM;
-       }
 
        if (au1100fb_setup(fbdev))
                goto failed;