lcd_mipid: call cancel_rearming_delayed_work only on scheduled work

[linux-2.6-omap-h63xx.git] / drivers / video / omap / lcd_mipid.c

diff --git a/drivers/video/omap/lcd_mipid.c b/drivers/video/omap/lcd_mipid.c
index 30261d248e4042a6a4825fcd057b292e99df52db..8168834e34c402fedc34d98b9c5abb6839cef1e9 100644 (file)
--- 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)