aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-pxa2xx.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/spi/spi-pxa2xx.c')
-rw-r--r--drivers/spi/spi-pxa2xx.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c
index 4fddc2a37a81..db9016bbd904 100644
--- a/drivers/spi/spi-pxa2xx.c
+++ b/drivers/spi/spi-pxa2xx.c
@@ -1305,7 +1305,8 @@ pxa2xx_spi_acpi_get_pdata(struct platform_device *pdev)
1305 struct resource *res; 1305 struct resource *res;
1306 const struct acpi_device_id *adev_id = NULL; 1306 const struct acpi_device_id *adev_id = NULL;
1307 const struct pci_device_id *pcidev_id = NULL; 1307 const struct pci_device_id *pcidev_id = NULL;
1308 int devid, type; 1308 unsigned int devid;
1309 int type;
1309 1310
1310 adev = ACPI_COMPANION(&pdev->dev); 1311 adev = ACPI_COMPANION(&pdev->dev);
1311 if (!adev) 1312 if (!adev)
@@ -1352,7 +1353,7 @@ pxa2xx_spi_acpi_get_pdata(struct platform_device *pdev)
1352 ssp->pdev = pdev; 1353 ssp->pdev = pdev;
1353 1354
1354 ssp->port_id = -1; 1355 ssp->port_id = -1;
1355 if (adev->pnp.unique_id && !kstrtoint(adev->pnp.unique_id, 0, &devid)) 1356 if (adev->pnp.unique_id && !kstrtouint(adev->pnp.unique_id, 0, &devid))
1356 ssp->port_id = devid; 1357 ssp->port_id = devid;
1357 1358
1358 pdata->num_chipselect = 1; 1359 pdata->num_chipselect = 1;