Merge tag 'dm-3.5-changes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/agk...

[deliverable/linux.git] / drivers / media / video / omap24xxcam.c

diff --git a/drivers/media/video/omap24xxcam.c b/drivers/media/video/omap24xxcam.c
index 7d3864144368c30e7a1916ae169c4999765fba62..e5015b0d5508cec9bd9af486c734fef3ff478179 100644 (file)
--- a/drivers/media/video/omap24xxcam.c
+++ b/drivers/media/video/omap24xxcam.c
@@ -1776,8 +1776,7 @@ static int __devinit omap24xxcam_probe(struct platform_device *pdev)
        cam->mmio_size = resource_size(mem);
 
        /* map the region */
-       cam->mmio_base = (unsigned long)
-               ioremap_nocache(cam->mmio_base_phys, cam->mmio_size);
+       cam->mmio_base = ioremap_nocache(cam->mmio_base_phys, cam->mmio_size);
        if (!cam->mmio_base) {
                dev_err(cam->dev, "cannot map camera register I/O region\n");
                goto err;