Merge tag 'f2fs-for-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk...

[~andy/linux] / sound / soc / kirkwood / kirkwood-i2s.c

diff --git a/sound/soc/kirkwood/kirkwood-i2s.c b/sound/soc/kirkwood/kirkwood-i2s.c
index 282d8b1163ba9583afd6e38e38400ce7efea29e9..c74c89065493cec9e90963bf1162be0ed7e5662d 100644 (file)
--- a/sound/soc/kirkwood/kirkwood-i2s.c
+++ b/sound/soc/kirkwood/kirkwood-i2s.c
@@ -472,11 +472,9 @@ static int kirkwood_i2s_dev_probe(struct platform_device *pdev)
                return -ENXIO;
        }
 
-       priv->io = devm_request_and_ioremap(&pdev->dev, mem);
-       if (!priv->io) {
-               dev_err(&pdev->dev, "devm_request_and_ioremap failed\n");
-               return -ENOMEM;
-       }
+       priv->io = devm_ioremap_resource(&pdev->dev, mem);
+       if (IS_ERR(priv->io))
+               return PTR_ERR(priv->io);
 
        priv->irq = platform_get_irq(pdev, 0);
        if (priv->irq <= 0) {