Merge branch 'drm-next-ast-fixes' of ssh://people.freedesktop.org/~/linux into drm...

[karo-tx-linux.git] / drivers / mfd / arizona-i2c.c

diff --git a/drivers/mfd/arizona-i2c.c b/drivers/mfd/arizona-i2c.c
index beccb790c9bab93869015044142666dc786b9508..9d4156fb082ae0b8d040e039ba17cd0aadf331d8 100644 (file)
--- a/drivers/mfd/arizona-i2c.c
+++ b/drivers/mfd/arizona-i2c.c
@@ -24,11 +24,12 @@
 #include "arizona.h"
 
 static int arizona_i2c_probe(struct i2c_client *i2c,
-                                         const struct i2c_device_id *id)
+                            const struct i2c_device_id *id)
 {
        struct arizona *arizona;
        const struct regmap_config *regmap_config;
-       int ret, type;
+       unsigned long type;
+       int ret;
 
        if (i2c->dev.of_node)
                type = arizona_of_get_type(&i2c->dev);