aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/video/s3c-fb.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/video/s3c-fb.c b/drivers/video/s3c-fb.c
index e22bf9ddf287..1fb7ddf8fb5f 100644
--- a/drivers/video/s3c-fb.c
+++ b/drivers/video/s3c-fb.c
@@ -1433,7 +1433,7 @@ static int __devinit s3c_fb_probe(struct platform_device *pdev)
1433 goto err_lcd_clk; 1433 goto err_lcd_clk;
1434 } 1434 }
1435 sfb->irq_no = res->start; 1435 sfb->irq_no = res->start;
1436 ret = request_irq(sfb->irq_no, s3c_fb_irq, 1436 ret = devm_request_irq(dev, sfb->irq_no, s3c_fb_irq,
1437 0, "s3c_fb", sfb); 1437 0, "s3c_fb", sfb);
1438 if (ret) { 1438 if (ret) {
1439 dev_err(dev, "irq request failed\n"); 1439 dev_err(dev, "irq request failed\n");
@@ -1499,7 +1499,6 @@ static int __devinit s3c_fb_probe(struct platform_device *pdev)
1499 1499
1500err_pm_runtime: 1500err_pm_runtime:
1501 pm_runtime_put_sync(sfb->dev); 1501 pm_runtime_put_sync(sfb->dev);
1502 free_irq(sfb->irq_no, sfb);
1503 1502
1504err_lcd_clk: 1503err_lcd_clk:
1505 pm_runtime_disable(sfb->dev); 1504 pm_runtime_disable(sfb->dev);
@@ -1535,8 +1534,6 @@ static int __devexit s3c_fb_remove(struct platform_device *pdev)
1535 if (sfb->windows[win]) 1534 if (sfb->windows[win])
1536 s3c_fb_release_win(sfb, sfb->windows[win]); 1535 s3c_fb_release_win(sfb, sfb->windows[win]);
1537 1536
1538 free_irq(sfb->irq_no, sfb);
1539
1540 if (!sfb->variant.has_clksel) { 1537 if (!sfb->variant.has_clksel) {
1541 clk_disable(sfb->lcd_clk); 1538 clk_disable(sfb->lcd_clk);
1542 clk_put(sfb->lcd_clk); 1539 clk_put(sfb->lcd_clk);