[SCSI] remove Scsi_Host_Template typedef

[linux-2.6] / drivers / usb / image / microtek.c

diff --git a/drivers/usb/image/microtek.c b/drivers/usb/image/microtek.c
index c84e1486054f83796bc3e6ee3c8483f11b58d4d3..61a2604cce4f47f6c08c78556bbe6c2b4261b6ef 100644 (file)
--- a/drivers/usb/image/microtek.c
+++ b/drivers/usb/image/microtek.c
@@ -632,7 +632,7 @@ out:
        return err;
 }
 
-static Scsi_Host_Template mts_scsi_host_template = {
+static struct scsi_host_template mts_scsi_host_template = {
        .module                 = THIS_MODULE,
        .name                   = "microtekX6",
        .proc_name              = "microtekX6",
@@ -773,11 +773,10 @@ static int mts_usb_probe(struct usb_interface *intf,
        }
        
        
-       new_desc = kmalloc(sizeof(struct mts_desc), GFP_KERNEL);
+       new_desc = kzalloc(sizeof(struct mts_desc), GFP_KERNEL);
        if (!new_desc)
                goto out;
 
-       memset(new_desc, 0, sizeof(*new_desc));
        new_desc->urb = usb_alloc_urb(0, GFP_KERNEL);
        if (!new_desc->urb)
                goto out_kfree;