diff --git a/[refs] b/[refs] index c7480f2bec9d..63dde0e4ed22 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bb7c276ec48b27d62a6d3f98e047a4b3d6a29b5c +refs/heads/master: 5af86c2691b9e0fc1f993cdcd4aa27eb684c1c17 diff --git a/trunk/drivers/media/video/s5p-fimc/fimc-core.c b/trunk/drivers/media/video/s5p-fimc/fimc-core.c index 917eef412566..2e319c71de02 100644 --- a/trunk/drivers/media/video/s5p-fimc/fimc-core.c +++ b/trunk/drivers/media/video/s5p-fimc/fimc-core.c @@ -841,7 +841,7 @@ static int fimc_probe(struct platform_device *pdev) clk_enable(fimc->clock[CLK_BUS]); ret = devm_request_irq(&pdev->dev, res->start, fimc_irq_handler, - 0, pdev->name, fimc); + 0, dev_name(&pdev->dev), fimc); if (ret) { dev_err(&pdev->dev, "failed to install irq (%d)\n", ret); goto err_clk;