From: Imre Deak Date: Mon, 24 Jul 2006 12:46:37 +0000 (+0300) Subject: lcd_mipid: call cancel_rearming_delayed_work only on scheduled work X-Git-Tag: v2.6.17-omap2~20 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=1115875ff0b6b447518f2cf0d3fec10a8b22b791;p=linux-2.6-omap-h63xx.git lcd_mipid: call cancel_rearming_delayed_work only on scheduled work Otherwise it will spin forever. Signed-off-by: Imre Deak Signed-off-by: Juha Yrjola --- diff --git a/drivers/video/omap/lcd_mipid.c b/drivers/video/omap/lcd_mipid.c index 30261d248e4..8168834e34c 100644 --- a/drivers/video/omap/lcd_mipid.c +++ b/drivers/video/omap/lcd_mipid.c @@ -381,7 +381,8 @@ static void mipid_esd_start_check(struct mipid_device *md) static void mipid_esd_stop_check(struct mipid_device *md) { - cancel_rearming_delayed_work(&md->esd_work); + if (md->esd_check != NULL) + cancel_rearming_delayed_work(&md->esd_work); } static void mipid_esd_work(void *data)