diff --git a/[refs] b/[refs] index aacec6ef0258..793f746d0435 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 97cf010aeb03fd515613313ad43508e49acae7fb +refs/heads/master: b32661e06ccf4be074aca48f0d070d306d4ff8a3 diff --git a/trunk/drivers/mfd/asic3.c b/trunk/drivers/mfd/asic3.c index 63fb1ff3ad10..f6f2d960cadb 100644 --- a/trunk/drivers/mfd/asic3.c +++ b/trunk/drivers/mfd/asic3.c @@ -28,14 +28,14 @@ static inline void asic3_write_register(struct asic3 *asic, unsigned int reg, u32 value) { - iowrite16(value, (unsigned long)asic->mapping + + iowrite16(value, asic->mapping + (reg >> asic->bus_shift)); } static inline u32 asic3_read_register(struct asic3 *asic, unsigned int reg) { - return ioread16((unsigned long)asic->mapping + + return ioread16(asic->mapping + (reg >> asic->bus_shift)); }