projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'cgroup-rmdir-updates' into cgroup/for-3.8
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-omap2
/
hsmmc.c
diff --git
a/arch/arm/mach-omap2/hsmmc.c
b/arch/arm/mach-omap2/hsmmc.c
index 03ebf47cfa9a493e1e7ac83cf0a2311110c8c04c..4d3a6324155f95de768fd1416f81ad068e80c3bd 100644
(file)
--- a/
arch/arm/mach-omap2/hsmmc.c
+++ b/
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;
}