diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2017-02-06 11:09:26 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2017-02-06 11:09:26 -0300 |
| commit | e06094ab6755efbba4944803ee08e67fc8c0ae6c (patch) | |
| tree | 6cf75f93f025e8908d47dc76e80cbd5b7441f009 /drivers/ata/sata_mv.c | |
| parent | d7cb3a507d23ef42574709fc5f2ca954e274ff91 (diff) | |
| parent | 53e74a112ce5c1c9b6a6923bdd6612133625d579 (diff) | |
| download | linux-stable-e06094ab6755efbba4944803ee08e67fc8c0ae6c.tar.gz linux-stable-e06094ab6755efbba4944803ee08e67fc8c0ae6c.tar.bz2 linux-stable-e06094ab6755efbba4944803ee08e67fc8c0ae6c.zip | |
Merge remote-tracking branch 'tip/perf/urgent' into perf/core
To pick fixes that are affecting tests of new 'perf diff' features in
perf/core.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'drivers/ata/sata_mv.c')
| -rw-r--r-- | drivers/ata/sata_mv.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c index 823e938c9a78..2f32782cea6d 100644 --- a/drivers/ata/sata_mv.c +++ b/drivers/ata/sata_mv.c @@ -4132,6 +4132,9 @@ static int mv_platform_probe(struct platform_device *pdev) host->iomap = NULL; hpriv->base = devm_ioremap(&pdev->dev, res->start, resource_size(res)); + if (!hpriv->base) + return -ENOMEM; + hpriv->base -= SATAHC0_REG_BASE; hpriv->clk = clk_get(&pdev->dev, NULL); |