Staging: Use kcalloc or kzalloc

[safe/jmp/linux-2.6] / drivers / staging / go7007 / go7007-usb.c

diff --git a/drivers/staging/go7007/go7007-usb.c b/drivers/staging/go7007/go7007-usb.c
index 1e89dc0..20ed930 100644 (file)
--- a/drivers/staging/go7007/go7007-usb.c
+++ b/drivers/staging/go7007/go7007-usb.c
@@ -444,7 +444,9 @@ static struct go7007_usb_board board_sensoray_2250 = {
        },
 };
 
-static struct usb_device_id go7007_usb_id_table[] = {
+MODULE_FIRMWARE("go7007tv.bin");
+
+static const struct usb_device_id go7007_usb_id_table[] = {
        {
                .match_flags    = USB_DEVICE_ID_MATCH_DEVICE_AND_VERSION |
                                        USB_DEVICE_ID_MATCH_INT_INFO,
@@ -668,10 +670,9 @@ static int go7007_usb_onboard_write_interrupt(struct go7007 *go,
                "go7007-usb: WriteInterrupt: %04x %04x\n", addr, data);
 #endif
 
-       tbuf = kmalloc(8, GFP_KERNEL);
+       tbuf = kzalloc(8, GFP_KERNEL);
        if (tbuf == NULL)
                return -ENOMEM;
-       memset(tbuf, 0, 8);
        tbuf[0] = data & 0xff;
        tbuf[1] = data >> 8;
        tbuf[2] = addr & 0xff;