summaryrefslogtreecommitdiffstats
path: root/drivers/power
diff options
context:
space:
mode:
authorAnton Vorontsov <cbouatmailru@gmail.com>2012-01-10 17:55:11 +0100
committerAnton Vorontsov <cbouatmailru@gmail.com>2012-01-10 17:55:11 +0100
commit913272b3864d6da89c70d9fc2c30ccb57794b369 (patch)
tree4fb0a8ab1b53623d2a8ea200b80a3ace2d271471 /drivers/power
parentpower_supply: Mark da9052 driver as broken (diff)
parentcollie_battery: Get rid of irq_to_gpio usage (diff)
downloadlinux-913272b3864d6da89c70d9fc2c30ccb57794b369.tar.xz
linux-913272b3864d6da89c70d9fc2c30ccb57794b369.zip
Merge git://git.infradead.org/users/cbou/battery-urgent
Diffstat (limited to 'drivers/power')
-rw-r--r--drivers/power/collie_battery.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/power/collie_battery.c b/drivers/power/collie_battery.c
index 1b4c17b527c1..74c6b23aeabf 100644
--- a/drivers/power/collie_battery.c
+++ b/drivers/power/collie_battery.c
@@ -146,7 +146,7 @@ static void collie_bat_external_power_changed(struct power_supply *psy)
static irqreturn_t collie_bat_gpio_isr(int irq, void *data)
{
- pr_info("collie_bat_gpio irq: %d\n", gpio_get_value(irq_to_gpio(irq)));
+ pr_info("collie_bat_gpio irq\n");
schedule_work(&bat_work);
return IRQ_HANDLED;
}