From 93b6ea9af7aa24e97d00cfe427b5318eab63daf8 Mon Sep 17 00:00:00 2001 From: Wei Yongjun Date: Fri, 21 Sep 2012 14:30:50 +0800 Subject: [PATCH] --- yaml --- r: 333319 b: refs/heads/master c: 64de3a00a16bcdf940cbebb1b2dc05d7cc13fef5 h: refs/heads/master i: 333317: 052919503e12244004703d3331960173ba9899dd 333315: 87faa24e589c20dfa80fecd9447531bb13a7418c 333311: d65f6f00ffaffa9d1fb74b4f64b776254cf68cc3 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/hsmmc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c29d52aa256c..2ad026d7161f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9ee677231bbc6a9e6ec9057d33d81eb248742b0a +refs/heads/master: 64de3a00a16bcdf940cbebb1b2dc05d7cc13fef5 diff --git a/trunk/arch/arm/mach-omap2/hsmmc.c b/trunk/arch/arm/mach-omap2/hsmmc.c index 03ebf47cfa9a..4d3a6324155f 100644 --- a/trunk/arch/arm/mach-omap2/hsmmc.c +++ b/trunk/arch/arm/mach-omap2/hsmmc.c @@ -523,7 +523,7 @@ static void __init omap_hsmmc_init_one(struct omap2_hsmmc_info *hsmmcinfo, dev_set_name(&pdev->dev, "%s.%d", pdev->name, pdev->id); od = omap_device_alloc(pdev, ohs, 1, NULL, 0); - if (!od) { + if (IS_ERR(od)) { pr_err("Could not allocate od for %s\n", name); goto put_pdev; }