linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: eric@eukrea.com (Eric Bénard)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 8/8] imxfb: fix PM
Date: Thu, 27 May 2010 08:33:20 +0200	[thread overview]
Message-ID: <1274942000-3580-8-git-send-email-eric@eukrea.com> (raw)
In-Reply-To: <1274942000-3580-7-git-send-email-eric@eukrea.com>

* if the screen is blanked, the clock is already disabled, so handle
this case
* before this patch, the following log was triggered :
WARNING: at arch/arm/plat-mxc/clock.c:59 __clk_disable+0x68/0x74()
Modules linked in:
[<c002d200>] (unwind_backtrace+0x0/0xf8) from [<c0046008>] (warn_slowpath_common+0x48/0x78)
[<c0046008>] (warn_slowpath_common+0x48/0x78) from [<c0031e28>] (__clk_disable+0x68/0x74)
[<c0031e28>] (__clk_disable+0x68/0x74) from [<c0031ddc>] (__clk_disable+0x1c/0x74)
[<c0031ddc>] (__clk_disable+0x1c/0x74) from [<c0031e58>] (clk_disable+0x24/0x34)
[<c0031e58>] (clk_disable+0x24/0x34) from [<c019808c>] (imxfb_disable_controller+0x38/0x48)
[<c019808c>] (imxfb_disable_controller+0x38/0x48) from [<c01980b0>] (imxfb_suspend+0x14/0x1c)

Signed-off-by: Eric B?nard <eric@eukrea.com>
---
 drivers/video/imxfb.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/video/imxfb.c b/drivers/video/imxfb.c
index b4b6dec..6cbfbff 100644
--- a/drivers/video/imxfb.c
+++ b/drivers/video/imxfb.c
@@ -597,8 +597,8 @@ static int imxfb_suspend(struct platform_device *dev, pm_message_t state)
 	struct imxfb_info *fbi = info->par;
 
 	pr_debug("%s\n", __func__);
-
-	imxfb_disable_controller(fbi);
+	if (readl(fbi->regs + LCDC_RMCR))
+		imxfb_disable_controller(fbi);
 	return 0;
 }
 
-- 
1.6.3.3

  reply	other threads:[~2010-05-27  6:33 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-05-27  6:33 [PATCH v2 1/8] i.MX27: add suspend to RAM support Eric Bénard
2010-05-27  6:33 ` [PATCH v2 2/8] mxc_nand: fix PM Eric Bénard
2010-05-27  6:33   ` [PATCH v2 3/8] imx_keypad: add PM support Eric Bénard
2010-05-27  6:33     ` [PATCH v2 4/8] eukrea_mbimx27: update keyboard platform data Eric Bénard
2010-05-27  6:33       ` [PATCH v2 5/8] serial/imx.c: fix suspend/resume Eric Bénard
2010-05-27  6:33         ` [PATCH v2 6/8] serial/imx: drvdata is sport and not &sport->port Eric Bénard
2010-05-27  6:33           ` [PATCH v2 7/8] net/fec: fix pm to survive to suspend/resume Eric Bénard
2010-05-27  6:33             ` Eric Bénard [this message]
2010-05-27 10:37             ` Sergei Shtylyov
2010-05-27 14:19               ` [PATCH v3] " Eric Bénard
2010-05-27 17:09                 ` Fabio Estevam
2010-05-27 17:53                   ` [PATCH] " Eric Bénard
2010-05-29  7:15                     ` David Miller
2010-05-29 20:04                       ` [PATCH v2] " Eric Bénard
2010-06-02 13:13                         ` David Miller
2010-05-29 12:23     ` [PATCH v2 3/8] imx_keypad: add PM support Alberto Panizzo
2010-05-30  8:51       ` [PATCH] " Eric Bénard
2010-06-02  8:02         ` Dmitry Torokhov
2010-05-27 17:55   ` [PATCH] mxc_nand: fix PM Eric Bénard
2010-06-14  7:07     ` Eric Bénard
2010-06-29  6:41       ` Artem Bityutskiy
2010-07-01  3:47       ` Artem Bityutskiy
2010-06-14  8:43     ` Uwe Kleine-König
2010-05-27 14:13 ` [PATCH v3] i.MX27: add suspend to RAM support Eric Bénard
2010-05-27 19:43   ` Russell King - ARM Linux
2010-05-27 20:06     ` Eric Bénard
2010-05-27 20:16       ` Russell King - ARM Linux
2010-05-27 20:48         ` [PATCH v4] " Eric Bénard
2010-05-27 20:54         ` [PATCH v3] " Eric Bénard
2010-05-27 21:46           ` Russell King - ARM Linux
2010-06-01 19:57             ` [PATCH v5] " Eric Bénard
2010-06-03  8:28               ` Sascha Hauer
2010-05-27 21:13         ` [PATCH v3] " Wolfram Sang

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1274942000-3580-8-git-send-email-eric@eukrea.com \
    --to=eric@eukrea.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).