Merge branch 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6 into grant

[~andy/linux] / drivers / video / udlfb.c

diff --git a/drivers/video/udlfb.c b/drivers/video/udlfb.c
index a159b63e18b9d3c14a3a989fa979ce21c425a66b..8af64148294b88074a269f54691d05a9cb00a547 100644 (file)
--- a/drivers/video/udlfb.c
+++ b/drivers/video/udlfb.c
@@ -893,7 +893,7 @@ static int dlfb_ops_open(struct fb_info *info, int user)
 
                struct fb_deferred_io *fbdefio;
 
-               fbdefio = kmalloc(sizeof(struct fb_deferred_io), GFP_KERNEL);
+               fbdefio = kzalloc(sizeof(struct fb_deferred_io), GFP_KERNEL);
 
                if (fbdefio) {
                        fbdefio->delay = DL_DEFIO_WRITE_DELAY;
@@ -1594,7 +1594,7 @@ static int dlfb_usb_probe(struct usb_interface *interface,
 
        dev = kzalloc(sizeof(*dev), GFP_KERNEL);
        if (dev == NULL) {
-               err("dlfb_usb_probe: failed alloc of dev struct\n");
+               dev_err(&interface->dev, "dlfb_usb_probe: failed alloc of dev struct\n");
                goto error;
        }