diff --git a/[refs] b/[refs] index 9fbc3e0915e7..8593d148526f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 159e36fe996411a4a05added6b7b20b1c4490ebb +refs/heads/master: c000c43cf12090972fad0fbb621d78c2100d0373 diff --git a/trunk/drivers/scsi/hosts.c b/trunk/drivers/scsi/hosts.c index bd8e7f323c69..96bc31266c98 100644 --- a/trunk/drivers/scsi/hosts.c +++ b/trunk/drivers/scsi/hosts.c @@ -220,7 +220,7 @@ int scsi_add_host(struct Scsi_Host *shost, struct device *dev) get_device(&shost->shost_gendev); if (shost->transportt->host_size && - (shost->shost_data = kmalloc(shost->transportt->host_size, + (shost->shost_data = kzalloc(shost->transportt->host_size, GFP_KERNEL)) == NULL) goto out_del_classdev;