From 6cef4a3f62615dfa583bb4dc9191f20dc5b3bfb6 Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Thu, 27 Jan 2011 16:49:07 +0100 Subject: [PATCH] --- yaml --- r: 235733 b: refs/heads/master c: 3073acd61cf278e4f85521186e937ab6e7fee739 h: refs/heads/master i: 235731: e7f6e0b98f9b36c794a1d797bb58145c059f0659 v: v3 --- [refs] | 2 +- trunk/drivers/staging/msm/lcdc.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a1acf934c139..2406fd0de5a2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: da9fcb7260af0cd85351740b526afdc88d4f348a +refs/heads/master: 3073acd61cf278e4f85521186e937ab6e7fee739 diff --git a/trunk/drivers/staging/msm/lcdc.c b/trunk/drivers/staging/msm/lcdc.c index 735280ab72cb..8183394aef76 100644 --- a/trunk/drivers/staging/msm/lcdc.c +++ b/trunk/drivers/staging/msm/lcdc.c @@ -224,12 +224,12 @@ static int __init lcdc_driver_init(void) mdp_lcdc_pclk_clk = clk_get(NULL, "mdp_lcdc_pclk_clk"); if (IS_ERR(mdp_lcdc_pclk_clk)) { printk(KERN_ERR "error: can't get mdp_lcdc_pclk_clk!\n"); - return IS_ERR(mdp_lcdc_pclk_clk); + return PTR_ERR(mdp_lcdc_pclk_clk); } mdp_lcdc_pad_pclk_clk = clk_get(NULL, "mdp_lcdc_pad_pclk_clk"); if (IS_ERR(mdp_lcdc_pad_pclk_clk)) { printk(KERN_ERR "error: can't get mdp_lcdc_pad_pclk_clk!\n"); - return IS_ERR(mdp_lcdc_pad_pclk_clk); + return PTR_ERR(mdp_lcdc_pad_pclk_clk); } // pm_qos_add_requirement(PM_QOS_SYSTEM_BUS_FREQ , "lcdc", // PM_QOS_DEFAULT_VALUE);