Merge ../linux-2.6 by hand

2 files changed, 23 insertions, 13 deletions

diff --git a/drivers/usb/image/mdc800.c b/drivers/usb/image/mdc800.c
index a330a4b50e16..1d973bcf56aa 100644
--- a/drivers/usb/image/mdc800.c
+++ b/drivers/usb/image/mdc800.c
@@ -425,9 +425,8 @@ static void mdc800_usb_download_notify (struct urb *urb, struct pt_regs *res)
 static struct usb_driver mdc800_usb_driver;
 static struct file_operations mdc800_device_ops;
 static struct usb_class_driver mdc800_class = {
-        .name =         "usb/mdc800%d",
+        .name =         "mdc800%d",
         .fops =         &mdc800_device_ops,
-        .mode =         S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP,
         .minor_base =   MDC800_DEVICE_MINOR_BASE,
 };
 
@@ -976,13 +975,13 @@ static struct usb_driver mdc800_usb_driver =
         Init and Cleanup this driver (Main Functions)
 *************************************************************************/
 
-#define try(A)           if (!(A)) goto cleanup_on_fail;
-
 static int __init usb_mdc800_init (void)
 {
         int retval = -ENODEV;
         /* Allocate Memory */
-        try (mdc800=kmalloc (sizeof (struct mdc800_data), GFP_KERNEL));
+        mdc800=kmalloc (sizeof (struct mdc800_data), GFP_KERNEL);
+        if (!mdc800)
+                goto cleanup_on_fail;
 
         memset(mdc800, 0, sizeof(struct mdc800_data));
         mdc800->dev = NULL;
@@ -998,13 +997,25 @@ static int __init usb_mdc800_init (void)
         mdc800->downloaded = 0;
         mdc800->written = 0;
 
-        try (mdc800->irq_urb_buffer=kmalloc (8, GFP_KERNEL));
-        try (mdc800->write_urb_buffer=kmalloc (8, GFP_KERNEL));
-        try (mdc800->download_urb_buffer=kmalloc (64, GFP_KERNEL));
+        mdc800->irq_urb_buffer=kmalloc (8, GFP_KERNEL);
+        if (!mdc800->irq_urb_buffer)
+                goto cleanup_on_fail;
+        mdc800->write_urb_buffer=kmalloc (8, GFP_KERNEL);
+        if (!mdc800->write_urb_buffer)
+                goto cleanup_on_fail;
+        mdc800->download_urb_buffer=kmalloc (64, GFP_KERNEL);
+        if (!mdc800->download_urb_buffer)
+                goto cleanup_on_fail;
 
-        try (mdc800->irq_urb=usb_alloc_urb (0, GFP_KERNEL));
-        try (mdc800->download_urb=usb_alloc_urb (0, GFP_KERNEL));
-        try (mdc800->write_urb=usb_alloc_urb (0, GFP_KERNEL));
+        mdc800->irq_urb=usb_alloc_urb (0, GFP_KERNEL);
+        if (!mdc800->irq_urb)
+                goto cleanup_on_fail;
+        mdc800->download_urb=usb_alloc_urb (0, GFP_KERNEL);
+        if (!mdc800->download_urb)
+                goto cleanup_on_fail;
+        mdc800->write_urb=usb_alloc_urb (0, GFP_KERNEL);
+        if (!mdc800->write_urb)
+                goto cleanup_on_fail;
 
         /* Register the driver */
         retval = usb_register(&mdc800_usb_driver);
diff --git a/drivers/usb/image/microtek.c b/drivers/usb/image/microtek.c
index c84e1486054f..c89d0769b3da 100644
--- a/drivers/usb/image/microtek.c
+++ b/drivers/usb/image/microtek.c
@@ -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;