Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 281399
b: refs/heads/master
c: c001dff
h: refs/heads/master
i:
  281397: 6792097
  281395: b60b2ec
  281391: f75a5d3
v: v3
  • Loading branch information
Greg Kroah-Hartman committed Dec 16, 2011
1 parent 6816d29 commit 2965263
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e0f5bb9b3850bdd7907eda9eb923cd3f9d4358b8
refs/heads/master: c001dff0f6715813bdb8e978dc8c05416c01962b
2 changes: 1 addition & 1 deletion trunk/drivers/staging/android/switch/switch.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ struct switch_dev {

struct gpio_switch_platform_data {
const char *name;
unsigned gpio;
unsigned gpio;

/* if NULL, switch_dev.name will be printed */
const char *name_on;
Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/staging/android/switch/switch_gpio.c
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ static int gpio_switch_probe(struct platform_device *pdev)
switch_data->state_off = pdata->state_off;
switch_data->sdev.print_state = switch_gpio_print_state;

ret = switch_dev_register(&switch_data->sdev);
ret = switch_dev_register(&switch_data->sdev);
if (ret < 0)
goto err_switch_dev_register;

Expand Down Expand Up @@ -126,7 +126,7 @@ static int gpio_switch_probe(struct platform_device *pdev)
err_set_gpio_input:
gpio_free(switch_data->gpio);
err_request_gpio:
switch_dev_unregister(&switch_data->sdev);
switch_dev_unregister(&switch_data->sdev);
err_switch_dev_register:
kfree(switch_data);

Expand All @@ -139,7 +139,7 @@ static int __devexit gpio_switch_remove(struct platform_device *pdev)

cancel_work_sync(&switch_data->work);
gpio_free(switch_data->gpio);
switch_dev_unregister(&switch_data->sdev);
switch_dev_unregister(&switch_data->sdev);
kfree(switch_data);

return 0;
Expand Down

0 comments on commit 2965263

Please sign in to comment.