summaryrefslogtreecommitdiff
path: root/drivers/mfd
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2014-07-24 17:07:16 +0100
committerLee Jones <lee.jones@linaro.org>2014-07-25 15:31:48 +0100
commitec8bd56699cb4371994437583a285b855b6f5e3a (patch)
tree048f2fee779efb43998f56a058cfd3cca412c372 /drivers/mfd
parenta259f3896a39ec7cbcd5f630a6ec95bdcbc080d2 (diff)
mfd: max77686: Ensure device type IDs are architecture agnostic
Extinguishes: ../drivers/mfd/max77686.c: In function ‘max77686_i2c_probe’: ../drivers/mfd/max77686.c:254:20: warning: cast from pointer to integer of different size Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/max77686.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/mfd/max77686.c b/drivers/mfd/max77686.c
index c65332291bb4..86e552348db4 100644
--- a/drivers/mfd/max77686.c
+++ b/drivers/mfd/max77686.c
@@ -251,10 +251,9 @@ static int max77686_i2c_probe(struct i2c_client *i2c,
if (!match)
return -EINVAL;
- max77686->type = (int)match->data;
- } else {
+ max77686->type = (unsigned long)match->data;
+ } else
max77686->type = id->driver_data;
- }
i2c_set_clientdata(i2c, max77686);
max77686->dev = &i2c->dev;