diff options
Diffstat (limited to 'drivers/mfd/ls2k-bmc-core.c')
| -rw-r--r-- | drivers/mfd/ls2k-bmc-core.c | 12 | 
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/mfd/ls2k-bmc-core.c b/drivers/mfd/ls2k-bmc-core.c index e162b3c7c9f8..69387dad6661 100644 --- a/drivers/mfd/ls2k-bmc-core.c +++ b/drivers/mfd/ls2k-bmc-core.c @@ -469,7 +469,7 @@ static int ls2k_bmc_probe(struct pci_dev *dev, const struct pci_device_id *id)  		return ret;  	ddata = devm_kzalloc(&dev->dev, sizeof(*ddata), GFP_KERNEL); -	if (IS_ERR(ddata)) { +	if (!ddata) {  		ret = -ENOMEM;  		goto disable_pci;  	} @@ -495,9 +495,13 @@ static int ls2k_bmc_probe(struct pci_dev *dev, const struct pci_device_id *id)  		goto disable_pci;  	} -	return devm_mfd_add_devices(&dev->dev, PLATFORM_DEVID_AUTO, -				    ls2k_bmc_cells, ARRAY_SIZE(ls2k_bmc_cells), -				    &dev->resource[0], 0, NULL); +	ret = devm_mfd_add_devices(&dev->dev, PLATFORM_DEVID_AUTO, +				   ls2k_bmc_cells, ARRAY_SIZE(ls2k_bmc_cells), +				   &dev->resource[0], 0, NULL); +	if (ret) +		goto disable_pci; + +	return 0;  disable_pci:  	pci_disable_device(dev);  | 
