Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

[~andy/linux] / drivers / mfd / abx500-core.c

diff --git a/drivers/mfd/abx500-core.c b/drivers/mfd/abx500-core.c
index 3b3b97ec32a764936ca1a8123287cb3c01397752..7ce65f49480f1bfb4b68d7c693a27451e797e27b 100644 (file)
--- a/drivers/mfd/abx500-core.c
+++ b/drivers/mfd/abx500-core.c
@@ -8,6 +8,7 @@
 #include <linux/list.h>
 #include <linux/slab.h>
 #include <linux/err.h>
+#include <linux/module.h>
 #include <linux/mfd/abx500.h>
 
 static LIST_HEAD(abx500_list);
@@ -36,7 +37,7 @@ int abx500_register_ops(struct device *dev, struct abx500_ops *ops)
        struct abx500_device_entry *dev_entry;
 
        dev_entry = kzalloc(sizeof(struct abx500_device_entry), GFP_KERNEL);
-       if (IS_ERR(dev_entry)) {
+       if (!dev_entry) {
                dev_err(dev, "register_ops kzalloc failed");
                return -ENOMEM;
        }