1 files changed, 2 insertions, 3 deletions

diff --git a/drivers/scsi/osst.c b/drivers/scsi/osst.c
index 08060fb478b6..119739502095 100644
--- a/drivers/scsi/osst.c
+++ b/drivers/scsi/osst.c
@@ -5778,13 +5778,12 @@ static int osst_probe(struct device *dev)
         dev_num = i;
 
         /* allocate a struct osst_tape for this device */
-        tpnt = kmalloc(sizeof(struct osst_tape), GFP_ATOMIC);
-        if (tpnt == NULL) {
+        tpnt = kzalloc(sizeof(struct osst_tape), GFP_ATOMIC);
+        if (!tpnt) {
                 write_unlock(&os_scsi_tapes_lock);
                 printk(KERN_ERR "osst :E: Can't allocate device descriptor, device not attached.\n");
                 goto out_put_disk;
         }
-        memset(tpnt, 0, sizeof(struct osst_tape));
 
         /* allocate a buffer for this device */
         i = SDp->host->sg_tablesize;