From 0f1564e77f706ae7ea53eb0114cb79b7172af206 Mon Sep 17 00:00:00 2001 From: "Kirill A. Shutemov" Date: Thu, 3 May 2012 15:08:50 +0100 Subject: [PATCH] --- yaml --- r: 307242 b: refs/heads/master c: 9d12028884bd2a5cc1fa7dea5090a4e7f392fdf4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/gma500/psb_irq.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f2c8210cc55f..776ab57a13e1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 232e6686abb011c8a1b4101245814c730efb1f0a +refs/heads/master: 9d12028884bd2a5cc1fa7dea5090a4e7f392fdf4 diff --git a/trunk/drivers/gpu/drm/gma500/psb_irq.c b/trunk/drivers/gpu/drm/gma500/psb_irq.c index 4ffb2a062098..8652cdf3f03f 100644 --- a/trunk/drivers/gpu/drm/gma500/psb_irq.c +++ b/trunk/drivers/gpu/drm/gma500/psb_irq.c @@ -426,7 +426,7 @@ void psb_irq_turn_off_dpst(struct drm_device *dev) psb_disable_pipestat(dev_priv, 0, PIPE_DPST_EVENT_ENABLE); pwm_reg = PSB_RVDC32(PWM_CONTROL_LOGIC); - PSB_WVDC32(pwm_reg & !(PWM_PHASEIN_INT_ENABLE), + PSB_WVDC32(pwm_reg & ~PWM_PHASEIN_INT_ENABLE, PWM_CONTROL_LOGIC); pwm_reg = PSB_RVDC32(PWM_CONTROL_LOGIC);