Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 348433
b: refs/heads/master
c: 6eac74d
h: refs/heads/master
i:
  348431: 077694c
v: v3
  • Loading branch information
Sachin Kamat authored and Inki Dae committed Jan 4, 2013
1 parent 43911c8 commit 36c0a27
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 15 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 15b3263eb3267b2be06f969f775f2e34624c7259
refs/heads/master: 6eac74d1b112c8381f483a97217446d79a611efa
18 changes: 4 additions & 14 deletions trunk/drivers/gpu/drm/exynos/exynos_drm_rotator.c
Original file line number Diff line number Diff line change
Expand Up @@ -658,29 +658,26 @@ static int __devinit rotator_probe(struct platform_device *pdev)
rot->regs_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!rot->regs_res) {
dev_err(dev, "failed to find registers\n");
ret = -ENOENT;
goto err_get_resource;
return -ENOENT;
}

rot->regs = devm_request_and_ioremap(dev, rot->regs_res);
if (!rot->regs) {
dev_err(dev, "failed to map register\n");
ret = -ENXIO;
goto err_get_resource;
return -ENXIO;
}

rot->irq = platform_get_irq(pdev, 0);
if (rot->irq < 0) {
dev_err(dev, "failed to get irq\n");
ret = rot->irq;
goto err_get_irq;
return rot->irq;
}

ret = request_threaded_irq(rot->irq, NULL, rotator_irq_handler,
IRQF_ONESHOT, "drm_rotator", rot);
if (ret < 0) {
dev_err(dev, "failed to request irq\n");
goto err_get_irq;
return ret;
}

rot->clock = clk_get(dev, "rotator");
Expand Down Expand Up @@ -724,10 +721,6 @@ static int __devinit rotator_probe(struct platform_device *pdev)
clk_put(rot->clock);
err_clk_get:
free_irq(rot->irq, rot);
err_get_irq:
devm_iounmap(dev, rot->regs);
err_get_resource:
devm_kfree(dev, rot);
return ret;
}

Expand All @@ -744,9 +737,6 @@ static int __devexit rotator_remove(struct platform_device *pdev)
clk_put(rot->clock);

free_irq(rot->irq, rot);
devm_iounmap(dev, rot->regs);

devm_kfree(dev, rot);

return 0;
}
Expand Down

0 comments on commit 36c0a27

Please sign in to comment.