From 051af87d219e4ac514cb3907529452e25240115a Mon Sep 17 00:00:00 2001 From: Wolfram Sang Date: Sun, 12 May 2013 15:19:57 +0200 Subject: [PATCH] --- yaml --- r: 375802 b: refs/heads/master c: 12716cd44da7e6c935e2fb1783417ca31fbbaa97 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/soc/kirkwood/kirkwood-i2s.c | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/[refs] b/[refs] index f33041487ab0..2eddc521de5a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5f68d04d39eeb16b9ea7639f62c4ae59163b4813 +refs/heads/master: 12716cd44da7e6c935e2fb1783417ca31fbbaa97 diff --git a/trunk/sound/soc/kirkwood/kirkwood-i2s.c b/trunk/sound/soc/kirkwood/kirkwood-i2s.c index befe68f59285..4c9dad3263c5 100644 --- a/trunk/sound/soc/kirkwood/kirkwood-i2s.c +++ b/trunk/sound/soc/kirkwood/kirkwood-i2s.c @@ -471,11 +471,6 @@ static int kirkwood_i2s_dev_probe(struct platform_device *pdev) dev_set_drvdata(&pdev->dev, priv); mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!mem) { - dev_err(&pdev->dev, "platform_get_resource failed\n"); - return -ENXIO; - } - priv->io = devm_ioremap_resource(&pdev->dev, mem); if (IS_ERR(priv->io)) return PTR_ERR(priv->io);