diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2021-07-19 04:56:58 +0300 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2021-07-19 04:56:58 +0300 |
| commit | 320424c7d44f54c18df9812fd7c45f6963524002 (patch) | |
| tree | 5853aff866a321d476f5e4f2a3de5b5e90408580 /drivers/media/platform/imx-pxp.c | |
| parent | f8f84af5da9ee04ef1d271528656dac42a090d00 (diff) | |
| parent | 62fb9874f5da54fdb243003b386128037319b219 (diff) | |
| download | linux-320424c7d44f54c18df9812fd7c45f6963524002.tar.xz | |
Merge tag 'v5.13' into next
Sync up with the mainline to get the latest parport API.
Diffstat (limited to 'drivers/media/platform/imx-pxp.c')
| -rw-r--r-- | drivers/media/platform/imx-pxp.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/media/platform/imx-pxp.c b/drivers/media/platform/imx-pxp.c index 08d76eb05ed1..4321edc0c23d 100644 --- a/drivers/media/platform/imx-pxp.c +++ b/drivers/media/platform/imx-pxp.c @@ -1654,11 +1654,8 @@ static int pxp_probe(struct platform_device *pdev) res = platform_get_resource(pdev, IORESOURCE_MEM, 0); dev->mmio = devm_ioremap_resource(&pdev->dev, res); - if (IS_ERR(dev->mmio)) { - ret = PTR_ERR(dev->mmio); - dev_err(&pdev->dev, "Failed to map register space: %d\n", ret); - return ret; - } + if (IS_ERR(dev->mmio)) + return PTR_ERR(dev->mmio); irq = platform_get_irq(pdev, 0); if (irq < 0) @@ -1755,7 +1752,7 @@ static struct platform_driver pxp_driver = { .remove = pxp_remove, .driver = { .name = MEM2MEM_NAME, - .of_match_table = of_match_ptr(pxp_dt_ids), + .of_match_table = pxp_dt_ids, }, }; |