diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-03-01 17:19:05 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-03-01 17:19:05 -0500 |
| commit | d702d12167a2c05a346f49aac7a311d597762495 (patch) | |
| tree | baae42c299cce34d6df24b5d01f8b1d0b481bd9a /drivers/scsi/pm8001/pm8001_init.c | |
| parent | 9418c65f9bd861d0f7e39aab9cfb3aa6f2275d11 (diff) | |
| parent | ac0f6f927db539e03e1f3f61bcd4ed57d5cde7a9 (diff) | |
Merge with mainline to remove plat-omap/Kconfig conflict
Conflicts:
arch/arm/plat-omap/Kconfig
Diffstat (limited to 'drivers/scsi/pm8001/pm8001_init.c')
| -rw-r--r-- | drivers/scsi/pm8001/pm8001_init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/pm8001/pm8001_init.c b/drivers/scsi/pm8001/pm8001_init.c index c2f1032496cb..f80c1da8f6ca 100644 --- a/drivers/scsi/pm8001/pm8001_init.c +++ b/drivers/scsi/pm8001/pm8001_init.c | |||
| @@ -654,7 +654,7 @@ static int __devinit pm8001_pci_probe(struct pci_dev *pdev, | |||
| 654 | } | 654 | } |
| 655 | chip = &pm8001_chips[ent->driver_data]; | 655 | chip = &pm8001_chips[ent->driver_data]; |
| 656 | SHOST_TO_SAS_HA(shost) = | 656 | SHOST_TO_SAS_HA(shost) = |
| 657 | kcalloc(1, sizeof(struct sas_ha_struct), GFP_KERNEL); | 657 | kzalloc(sizeof(struct sas_ha_struct), GFP_KERNEL); |
| 658 | if (!SHOST_TO_SAS_HA(shost)) { | 658 | if (!SHOST_TO_SAS_HA(shost)) { |
| 659 | rc = -ENOMEM; | 659 | rc = -ENOMEM; |
| 660 | goto err_out_free_host; | 660 | goto err_out_free_host; |