diff options
Diffstat (limited to 'drivers/media/platform/samsung/s5p-jpeg/jpeg-core.c')
| -rw-r--r-- | drivers/media/platform/samsung/s5p-jpeg/jpeg-core.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.c b/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.c index c3c7e48f1b6e..d2c4a0178b3c 100644 --- a/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.c +++ b/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.c @@ -2870,10 +2870,8 @@ static int s5p_jpeg_probe(struct platform_device *pdev) /* interrupt service routine registration */ jpeg->irq = ret = platform_get_irq(pdev, 0); - if (ret < 0) { - dev_err(&pdev->dev, "cannot find IRQ\n"); + if (ret < 0) return ret; - } ret = devm_request_irq(&pdev->dev, jpeg->irq, jpeg->variant->jpeg_irq, 0, dev_name(&pdev->dev), jpeg); @@ -3164,7 +3162,7 @@ static struct platform_driver s5p_jpeg_driver = { .probe = s5p_jpeg_probe, .remove_new = s5p_jpeg_remove, .driver = { - .of_match_table = of_match_ptr(samsung_jpeg_match), + .of_match_table = samsung_jpeg_match, .name = S5P_JPEG_M2M_NAME, .pm = &s5p_jpeg_pm_ops, }, |