drivers: video: msm: fix hang on disable_irq

[pandora-kernel.git] / drivers / video / msm / mdp.c

diff --git a/drivers/video/msm/mdp.c b/drivers/video/msm/mdp.c
index 19c01c6..2b5bf79 100644 (file)
--- a/drivers/video/msm/mdp.c
+++ b/drivers/video/msm/mdp.c
@@ -90,7 +90,7 @@ static int locked_disable_mdp_irq(struct mdp_info *mdp, uint32_t mask)
        mdp_irq_mask &= ~(mask);
        /* if no one is waiting on the interrupt, disable it */
        if (!mdp_irq_mask) {
-               disable_irq(mdp->irq);
+               disable_irq_nosync(mdp->irq);
                if (clk)
                        clk_disable(clk);
        }
@@ -258,7 +258,6 @@ int get_img(struct mdp_img *img, struct fb_info *info,
 {
        int put_needed, ret = 0;
        struct file *file;
-       unsigned long vstart;
 
        file = fget_light(img->memory_id, &put_needed);
        if (file == NULL)