diff options
author | Takashi Iwai <tiwai@suse.de> | 2011-09-22 11:56:12 +0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-09-22 11:56:12 +0400 |
commit | af1910a817c5ad52c32dddacc1744cfa1b35889e (patch) | |
tree | 2d6504a2ac5971bb84e0172bbdd309b781048849 /drivers/input/misc/twl6040-vibra.c | |
parent | 5495ffbd7b56d8bffebc5e30f03ea374590f1bb4 (diff) | |
parent | f648de832dbf6d1947ce5a7c0ed24a3a71d8545b (diff) | |
download | linux-af1910a817c5ad52c32dddacc1744cfa1b35889e.tar.xz |
Merge branch 'topic/asoc' into topic/remove-irqf_disable
Diffstat (limited to 'drivers/input/misc/twl6040-vibra.c')
-rw-r--r-- | drivers/input/misc/twl6040-vibra.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/misc/twl6040-vibra.c b/drivers/input/misc/twl6040-vibra.c index c43002e7ec72..154b7a324d67 100644 --- a/drivers/input/misc/twl6040-vibra.c +++ b/drivers/input/misc/twl6040-vibra.c @@ -97,7 +97,7 @@ static void twl6040_vibra_enable(struct vibra_info *info) } twl6040_power(info->twl6040, 1); - if (twl6040->rev <= TWL6040_REV_ES1_1) { + if (twl6040_get_revid(twl6040) <= TWL6040_REV_ES1_1) { /* * ERRATA: Disable overcurrent protection for at least * 3ms when enabling vibrator drivers to avoid false |