Merge branch 'linus'

1 files changed, 1 insertions, 2 deletions

diff --git a/drivers/usb/storage/sddr55.c b/drivers/usb/storage/sddr55.c
index 8451779f4269..0b1b5b59ca7b 100644
--- a/drivers/usb/storage/sddr55.c
+++ b/drivers/usb/storage/sddr55.c
@@ -751,11 +751,10 @@ int sddr55_transport(struct scsi_cmnd *srb, struct us_data *us)
         struct sddr55_card_info *info;
 
         if (!us->extra) {
-                us->extra = kmalloc(
+                us->extra = kzalloc(
                         sizeof(struct sddr55_card_info), GFP_NOIO);
                 if (!us->extra)
                         return USB_STOR_TRANSPORT_ERROR;
-                memset(us->extra, 0, sizeof(struct sddr55_card_info));
                 us->extra_destructor = sddr55_card_info_destructor;
         }