From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from wolverine02.qualcomm.com ([199.106.114.251]:16851 "EHLO wolverine02.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754259Ab0GMUDi (ORCPT ); Tue, 13 Jul 2010 16:03:38 -0400 From: Daniel Walker Subject: [PATCH 5/5] [ARM] msm: mdp: fix for 2.6.32 Date: Tue, 13 Jul 2010 13:03:11 -0700 Message-Id: <1279051391-16564-5-git-send-email-dwalker@codeaurora.org> In-Reply-To: <1279051391-16564-1-git-send-email-dwalker@codeaurora.org> References: <1279051391-16564-1-git-send-email-dwalker@codeaurora.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-arm-msm-owner@vger.kernel.org List-ID: To: linux-arm-msm@vger.kernel.org Cc: Pavel Machek , David =?iso-8859-1?q?Lanzend=F6rfer?= , =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= From: Arve Hjønnevåg Signed-off-by: Arve Hjønnevåg --- drivers/video/msm/mdp.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/drivers/video/msm/mdp.c b/drivers/video/msm/mdp.c index 3c28db0..c3636d5 100644 --- a/drivers/video/msm/mdp.c +++ b/drivers/video/msm/mdp.c @@ -90,7 +90,7 @@ static int locked_disable_mdp_irq(struct mdp_info *mdp, uint32_t mask) mdp_irq_mask &= ~(mask); /* if no one is waiting on the interrupt, disable it */ if (!mdp_irq_mask) { - disable_irq(mdp->irq); + disable_irq_nosync(mdp->irq); if (clk) clk_disable(clk); } @@ -482,6 +482,7 @@ int mdp_probe(struct platform_device *pdev) /* register mdp device */ mdp->mdp_dev.dev.parent = &pdev->dev; mdp->mdp_dev.dev.class = mdp_class; + dev_set_name(&mdp->mdp_dev.dev, "mdp%d", pdev->id); /* if you can remove the platform device you'd have to implement * this: -- 1.7.0.4 -- Sent by an consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.