From 6c391fafadd1ebf7d29981f75aaef44a2d7ba701 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Tue, 18 Dec 2012 15:43:45 +0800 Subject: [PATCH] --- yaml --- r: 350721 b: refs/heads/master c: 9f58b9b9fe3646421d9de251a4c5eec6d299a395 h: refs/heads/master i: 350719: 15e90ca390e15325fc635f9e13a513ddf7bbb290 v: v3 --- [refs] | 2 +- trunk/drivers/clk/clk-max77686.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b111106b84ae..9c592f4a11df 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bab53301c3846ae9a5e1142dca2976f434f70481 +refs/heads/master: 9f58b9b9fe3646421d9de251a4c5eec6d299a395 diff --git a/trunk/drivers/clk/clk-max77686.c b/trunk/drivers/clk/clk-max77686.c index d098f72e1d5f..894421417000 100644 --- a/trunk/drivers/clk/clk-max77686.c +++ b/trunk/drivers/clk/clk-max77686.c @@ -132,7 +132,7 @@ static int max77686_clk_register(struct device *dev, max77686->lookup = devm_kzalloc(dev, sizeof(struct clk_lookup), GFP_KERNEL); - if (IS_ERR(max77686->lookup)) + if (!max77686->lookup) return -ENOMEM; max77686->lookup->con_id = hw->init->name; @@ -151,13 +151,13 @@ static int max77686_clk_probe(struct platform_device *pdev) max77686_clks = devm_kzalloc(&pdev->dev, sizeof(struct max77686_clk *) * MAX77686_CLKS_NUM, GFP_KERNEL); - if (IS_ERR(max77686_clks)) + if (!max77686_clks) return -ENOMEM; for (i = 0; i < MAX77686_CLKS_NUM; i++) { max77686_clks[i] = devm_kzalloc(&pdev->dev, sizeof(struct max77686_clk), GFP_KERNEL); - if (IS_ERR(max77686_clks[i])) + if (!max77686_clks[i]) return -ENOMEM; }