diff options
Diffstat (limited to 'drivers/media/platform/meson/ge2d/ge2d.c')
-rw-r--r-- | drivers/media/platform/meson/ge2d/ge2d.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/media/platform/meson/ge2d/ge2d.c b/drivers/media/platform/meson/ge2d/ge2d.c index a1393fefa8ae..ccda18e5a377 100644 --- a/drivers/media/platform/meson/ge2d/ge2d.c +++ b/drivers/media/platform/meson/ge2d/ge2d.c @@ -779,11 +779,7 @@ static int ge2d_s_ctrl(struct v4l2_ctrl *ctrl) * If the rotation parameter changes the OUTPUT frames * parameters, take them in account */ - if (fmt.width != ctx->out.pix_fmt.width || - fmt.height != ctx->out.pix_fmt.width || - fmt.bytesperline > ctx->out.pix_fmt.bytesperline || - fmt.sizeimage > ctx->out.pix_fmt.sizeimage) - ctx->out.pix_fmt = fmt; + ctx->out.pix_fmt = fmt; break; } @@ -926,7 +922,6 @@ static int ge2d_probe(struct platform_device *pdev) struct reset_control *rst; struct video_device *vfd; struct meson_ge2d *ge2d; - struct resource *res; void __iomem *regs; int ret = 0; int irq; @@ -941,8 +936,7 @@ static int ge2d_probe(struct platform_device *pdev) ge2d->dev = &pdev->dev; mutex_init(&ge2d->mutex); - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - regs = devm_ioremap_resource(ge2d->dev, res); + regs = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(regs)) return PTR_ERR(regs); |