diff options
| author | Tejun Heo <tj@kernel.org> | 2014-09-23 10:07:22 -0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2014-09-23 10:07:22 -0400 |
| commit | ec489eb8e027f0ca5ec43d609c6c42b527c21862 (patch) | |
| tree | a22da1737740a039107d50b75ad6166847e1d0b7 /drivers/ata | |
| parent | 676bd1983d6e308c6e95e3b0671011f3399a7407 (diff) | |
| parent | a77b6ee90dfc3798bdcbdca7a9284d7e8c006af7 (diff) | |
Merge branch 'for-3.18' into for-next
Diffstat (limited to 'drivers/ata')
| -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 f03aab187f4d..0f8538f238b6 100644 --- a/drivers/ata/ahci_xgene.c +++ b/drivers/ata/ahci_xgene.c @@ -434,7 +434,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); @@ -484,7 +484,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); |