git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'stable-3.2' into pandora-3.2
[pandora-kernel.git]
/
drivers
/
mfd
/
da903x.c
diff --git
a/drivers/mfd/da903x.c
b/drivers/mfd/da903x.c
index
1b79c37
..
1924b85
100644
(file)
--- a/
drivers/mfd/da903x.c
+++ b/
drivers/mfd/da903x.c
@@
-182,7
+182,7
@@
int da903x_set_bits(struct device *dev, int reg, uint8_t bit_mask)
if (ret)
goto out;
if (ret)
goto out;
- if ((reg_val & bit_mask)
== 0
) {
+ if ((reg_val & bit_mask)
!= bit_mask
) {
reg_val |= bit_mask;
ret = __da903x_write(chip->client, reg, reg_val);
}
reg_val |= bit_mask;
ret = __da903x_write(chip->client, reg, reg_val);
}
@@
-549,6
+549,7
@@
static int __devexit da903x_remove(struct i2c_client *client)
struct da903x_chip *chip = i2c_get_clientdata(client);
da903x_remove_subdevs(chip);
struct da903x_chip *chip = i2c_get_clientdata(client);
da903x_remove_subdevs(chip);
+ free_irq(client->irq, chip);
kfree(chip);
return 0;
}
kfree(chip);
return 0;
}