diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-25 09:51:40 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-25 09:51:40 +0100 |
| commit | 605d427ccc27faaeca2970fe80865ead00aa67d0 (patch) | |
| tree | 8548f7dcaf6afea973649c65783e1641e4eba31a /drivers/spi | |
| parent | 176c51c1e4fbe04c273d564cf9ccf569606b5fd2 (diff) | |
| parent | 9553821ead2b6e813a8b3a5360e20e28bfabc177 (diff) | |
| download | linux-605d427ccc27faaeca2970fe80865ead00aa67d0.tar.gz linux-605d427ccc27faaeca2970fe80865ead00aa67d0.tar.bz2 linux-605d427ccc27faaeca2970fe80865ead00aa67d0.zip | |
Merge remote-tracking branch 'spi/topic/topcliff' into spi-next
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-topcliff-pch.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi-topcliff-pch.c b/drivers/spi/spi-topcliff-pch.c index 14843efaaf3a..446131308acb 100644 --- a/drivers/spi/spi-topcliff-pch.c +++ b/drivers/spi/spi-topcliff-pch.c @@ -1411,13 +1411,13 @@ static int pch_spi_pd_probe(struct platform_device *plat_dev) /* baseaddress + address offset) */ data->io_base_addr = pci_resource_start(board_dat->pdev, 1) + PCH_ADDRESS_SIZE * plat_dev->id; - data->io_remap_addr = pci_iomap(board_dat->pdev, 1, 0) + - PCH_ADDRESS_SIZE * plat_dev->id; + data->io_remap_addr = pci_iomap(board_dat->pdev, 1, 0); if (!data->io_remap_addr) { dev_err(&plat_dev->dev, "%s pci_iomap failed\n", __func__); ret = -ENOMEM; goto err_pci_iomap; } + data->io_remap_addr += PCH_ADDRESS_SIZE * plat_dev->id; dev_dbg(&plat_dev->dev, "[ch%d] remap_addr=%p\n", plat_dev->id, data->io_remap_addr); |