---

yaml --- r: 333319 b: refs/heads/master c: 64de3a0 h: refs/heads/master i: 333317: 0529195 333315: 87faa24 333311: d65f6f0 v: v3
git-mirror · Oct 8, 2012 · 93b6ea9 · 93b6ea9
1 parent 67428f4
commit 93b6ea9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;
 	}