xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'grant/devicetree/next' into for-next

Browse Source
This commit is contained in:
Rob Herring
2013-11-07 10:34:46 -06:00
parent e363bbac31 355e62f5ad
commit b5480950c6
505 changed files with 4155 additions and 2570 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/spi/spi-fsl-espi.c
View File

@@ -689,7 +689,7 @@ static int of_fsl_espi_probe(struct platform_device *ofdev)
struct device_node *np = ofdev->dev.of_node;
struct spi_master *master;
struct resource mem;
struct resource irq;
unsigned int irq;
int ret = -ENOMEM;
ret = of_mpc8xxx_spi_probe(ofdev);
@@ -704,13 +704,13 @@ static int of_fsl_espi_probe(struct platform_device *ofdev)
if (ret)
goto err;
ret = of_irq_to_resource(np, 0, &irq);
irq = irq_of_parse_and_map(np, 0);
if (!ret) {
ret = -EINVAL;
goto err;
}
master = fsl_espi_probe(dev, &mem, irq.start);
master = fsl_espi_probe(dev, &mem, irq);
if (IS_ERR(master)) {
ret = PTR_ERR(master);
goto err;