From 3f54f26ffc6efc4a384eefc9682f013260b720f1 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Fri, 8 Jul 2011 09:45:32 +0100 Subject: [PATCH] --- yaml --- r: 260012 b: refs/heads/master c: d75758b3d12b45fc7535083a968b3a99935c9d9a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/gma500/mdfld_dsi_dbi.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ed56713fbc0b..f7f3f3172765 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fc5ace7ed2a58e32047abf65ff8b5a6432e92fac +refs/heads/master: d75758b3d12b45fc7535083a968b3a99935c9d9a diff --git a/trunk/drivers/staging/gma500/mdfld_dsi_dbi.c b/trunk/drivers/staging/gma500/mdfld_dsi_dbi.c index 9d2d97db1961..489734553317 100644 --- a/trunk/drivers/staging/gma500/mdfld_dsi_dbi.c +++ b/trunk/drivers/staging/gma500/mdfld_dsi_dbi.c @@ -642,7 +642,7 @@ void mdfld_dbi_dsr_exit(struct drm_device *dev) struct drm_psb_private *dev_priv = dev->dev_private; struct mdfld_dbi_dsr_info *dsr_info = dev_priv->dbi_dsr_info; - if (!dsr_info) { + if (dsr_info) { del_timer_sync(&dsr_info->dsr_timer); kfree(dsr_info); dev_priv->dbi_dsr_info = NULL;