Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

1 files changed, 1 insertions, 2 deletions

diff --git a/drivers/usb/storage/datafab.c b/drivers/usb/storage/datafab.c
index 54e3e6c7ecd8..01d8971ad7db 100644
--- a/drivers/usb/storage/datafab.c
+++ b/drivers/usb/storage/datafab.c
@@ -512,13 +512,12 @@ int datafab_transport(struct scsi_cmnd * srb, struct us_data *us)
         };
 
         if (!us->extra) {
-                us->extra = kmalloc(sizeof(struct datafab_info), GFP_NOIO);
+                us->extra = kzalloc(sizeof(struct datafab_info), GFP_NOIO);
                 if (!us->extra) {
                         US_DEBUGP("datafab_transport:  Gah! "
                                   "Can't allocate storage for Datafab info struct!\n");
                         return USB_STOR_TRANSPORT_ERROR;
                 }
-                memset(us->extra, 0, sizeof(struct datafab_info));
                 us->extra_destructor = datafab_info_destructor;
                 ((struct datafab_info *)us->extra)->lun = -1;
         }