Merge current mainline tree into linux-omap tree

[pandora-kernel.git] / drivers / video / omap / dispc.c

diff --git a/drivers/video/omap/dispc.c b/drivers/video/omap/dispc.c
index 5c643f0..4c055a2 100644 (file)
--- a/drivers/video/omap/dispc.c
+++ b/drivers/video/omap/dispc.c
@@ -1405,7 +1405,7 @@ static int omap_dispc_init(struct omapfb_device *fbdev, int ext_mode,
        dispc_write_reg(DISPC_CONFIG, l);
 
        l = dispc_read_reg(DISPC_IRQSTATUS);
-       dispc_write_reg(l, DISPC_IRQSTATUS);
+       dispc_write_reg(DISPC_IRQSTATUS, l);
 
        /* Enable those that we handle always */
        omap_dispc_enable_irqs(DISPC_IRQ_FRAMEMASK);