diff options
Diffstat (limited to 'sound/soc/tegra/tegra20_das.c')
-rw-r--r-- | sound/soc/tegra/tegra20_das.c | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/sound/soc/tegra/tegra20_das.c b/sound/soc/tegra/tegra20_das.c index f52600b4f3fd..89add13c31cf 100644 --- a/sound/soc/tegra/tegra20_das.c +++ b/sound/soc/tegra/tegra20_das.c | |||
@@ -133,7 +133,7 @@ static const struct regmap_config tegra20_das_regmap_config = { | |||
133 | 133 | ||
134 | static int tegra20_das_probe(struct platform_device *pdev) | 134 | static int tegra20_das_probe(struct platform_device *pdev) |
135 | { | 135 | { |
136 | struct resource *res, *region; | 136 | struct resource *res; |
137 | void __iomem *regs; | 137 | void __iomem *regs; |
138 | int ret = 0; | 138 | int ret = 0; |
139 | 139 | ||
@@ -149,24 +149,9 @@ static int tegra20_das_probe(struct platform_device *pdev) | |||
149 | das->dev = &pdev->dev; | 149 | das->dev = &pdev->dev; |
150 | 150 | ||
151 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 151 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
152 | if (!res) { | 152 | regs = devm_ioremap_resource(&pdev->dev, res); |
153 | dev_err(&pdev->dev, "No memory resource\n"); | 153 | if (IS_ERR(regs)) { |
154 | ret = -ENODEV; | 154 | ret = PTR_ERR(regs); |
155 | goto err; | ||
156 | } | ||
157 | |||
158 | region = devm_request_mem_region(&pdev->dev, res->start, | ||
159 | resource_size(res), pdev->name); | ||
160 | if (!region) { | ||
161 | dev_err(&pdev->dev, "Memory region already claimed\n"); | ||
162 | ret = -EBUSY; | ||
163 | goto err; | ||
164 | } | ||
165 | |||
166 | regs = devm_ioremap(&pdev->dev, res->start, resource_size(res)); | ||
167 | if (!regs) { | ||
168 | dev_err(&pdev->dev, "ioremap failed\n"); | ||
169 | ret = -ENOMEM; | ||
170 | goto err; | 155 | goto err; |
171 | } | 156 | } |
172 | 157 | ||