diff options
| author | Anton Vorontsov <cbouatmailru@gmail.com> | 2012-01-10 11:55:11 -0500 |
|---|---|---|
| committer | Anton Vorontsov <cbouatmailru@gmail.com> | 2012-01-10 11:55:11 -0500 |
| commit | 913272b3864d6da89c70d9fc2c30ccb57794b369 (patch) | |
| tree | 4fb0a8ab1b53623d2a8ea200b80a3ace2d271471 /drivers/power | |
| parent | 6cfc2a23540667cff6da6e41d1f1167a9a45aa9a (diff) | |
| parent | 629bcb4b72d49b3631ae3dd0fe1d345820fadfcc (diff) | |
Merge git://git.infradead.org/users/cbou/battery-urgent
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/collie_battery.c | 2 |
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) | |||
| 146 | 146 | ||
| 147 | static irqreturn_t collie_bat_gpio_isr(int irq, void *data) | 147 | static irqreturn_t collie_bat_gpio_isr(int irq, void *data) |
| 148 | { | 148 | { |
| 149 | pr_info("collie_bat_gpio irq: %d\n", gpio_get_value(irq_to_gpio(irq))); | 149 | pr_info("collie_bat_gpio irq\n"); |
| 150 | schedule_work(&bat_work); | 150 | schedule_work(&bat_work); |
| 151 | return IRQ_HANDLED; | 151 | return IRQ_HANDLED; |
| 152 | } | 152 | } |