diff options
| -rw-r--r-- | drivers/mfd/palmas.c | 4 | ||||
| -rw-r--r-- | include/linux/mfd/palmas.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mfd/palmas.c b/drivers/mfd/palmas.c index 244b21cbbb80..480cefb149f1 100644 --- a/drivers/mfd/palmas.c +++ b/drivers/mfd/palmas.c @@ -2,7 +2,7 @@ * TI Palmas MFD Driver * * Copyright 2011-2012 Texas Instruments Inc. - * Copyright (c) 2013, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2013-2014, NVIDIA CORPORATION. All rights reserved. * * Author: Graeme Gregory <gg@slimlogic.co.uk> * @@ -1058,7 +1058,7 @@ static int palmas_i2c_probe(struct i2c_client *i2c, &i2c->dev); if (!match) return -ENODATA; - palmas->id = (unsigned int)match->data; + palmas->id = (u32)((uintptr_t)match->data); } else { palmas->id = id->driver_data; } diff --git a/include/linux/mfd/palmas.h b/include/linux/mfd/palmas.h index 73d0ad4a236c..8f64c1ad32b8 100644 --- a/include/linux/mfd/palmas.h +++ b/include/linux/mfd/palmas.h @@ -234,7 +234,7 @@ struct palmas { DECLARE_BITMAP(volatile_smps_registers, PALMAS_MAX_FN_REGISTERS); /* Stored chip id */ - int id; + u32 id; unsigned int submodule_lists; |