diff options
| author | Suman Tripathi <stripathi@apm.com> | 2014-09-22 15:01:33 +0200 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2014-09-23 16:07:11 +0200 |
| commit | a77b6ee90dfc3798bdcbdca7a9284d7e8c006af7 (patch) | |
| tree | da77300ea56e188deb20d6f2dc3262bdf5b7bd9e | |
| parent | libata: change ata_<foo>_printk routines to return void (diff) | |
| download | linux-a77b6ee90dfc3798bdcbdca7a9284d7e8c006af7.tar.xz linux-a77b6ee90dfc3798bdcbdca7a9284d7e8c006af7.zip | |
ahci_xgene: Fix the error print invalid resource for APM X-Gene SoC AHCI SATA Host Controller driver.
This patch fixes the error print invalid resource for the APM X-Gene
SoC AHCI SATA Host Controller driver. This print was due to the fact
that the controller 3 don't have a mux resource. This didn't result
in any errors but the print seems like meaningless.
Signed-off-by: Loc Ho <lho@apm.com>
Signed-off-by: Suman Tripathi <stripathi@apm.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
| -rw-r--r-- | drivers/ata/ahci_xgene.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/ata/ahci_xgene.c b/drivers/ata/ahci_xgene.c index bc281115490b..7822c8e7a948 100644 --- a/drivers/ata/ahci_xgene.c +++ b/drivers/ata/ahci_xgene.c @@ -406,7 +406,7 @@ static int xgene_ahci_mux_select(struct xgene_ahci_context *ctx) u32 val; /* Check for optional MUX resource */ - if (IS_ERR(ctx->csr_mux)) + if (!ctx->csr_mux) return 0; val = readl(ctx->csr_mux + SATA_ENET_CONFIG_REG); @@ -456,7 +456,13 @@ static int xgene_ahci_probe(struct platform_device *pdev) /* Retrieve the optional IP mux resource */ res = platform_get_resource(pdev, IORESOURCE_MEM, 4); - ctx->csr_mux = devm_ioremap_resource(dev, res); + if (res) { + void __iomem *csr = devm_ioremap_resource(dev, res); + if (IS_ERR(csr)) + return PTR_ERR(csr); + + ctx->csr_mux = csr; + } dev_dbg(dev, "VAddr 0x%p Mmio VAddr 0x%p\n", ctx->csr_core, hpriv->mmio); |