projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch develop-3.10 into develop-3.10-next
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
spi
/
spi-topcliff-pch.c
diff --git
a/drivers/spi/spi-topcliff-pch.c
b/drivers/spi/spi-topcliff-pch.c
index 35f60bd252dda9e6ce61d474cf317eb301c85ff4..637d728fbeb5b3d2c573baf5c19c72e6dd542a3d 100644
(file)
--- a/
drivers/spi/spi-topcliff-pch.c
+++ b/
drivers/spi/spi-topcliff-pch.c
@@
-1487,7
+1487,7
@@
static int pch_spi_pd_probe(struct platform_device *plat_dev)
return 0;
err_spi_register_master:
return 0;
err_spi_register_master:
- free_irq(board_dat->pdev->irq,
board_dat
);
+ free_irq(board_dat->pdev->irq,
data
);
err_request_irq:
pch_spi_free_resources(board_dat, data);
err_spi_get_resources:
err_request_irq:
pch_spi_free_resources(board_dat, data);
err_spi_get_resources:
@@
-1667,6
+1667,7
@@
static int pch_spi_probe(struct pci_dev *pdev,
pd_dev = platform_device_alloc("pch-spi", i);
if (!pd_dev) {
dev_err(&pdev->dev, "platform_device_alloc failed\n");
pd_dev = platform_device_alloc("pch-spi", i);
if (!pd_dev) {
dev_err(&pdev->dev, "platform_device_alloc failed\n");
+ retval = -ENOMEM;
goto err_platform_device;
}
pd_dev_save->pd_save[i] = pd_dev;
goto err_platform_device;
}
pd_dev_save->pd_save[i] = pd_dev;