From 2965263b86c6128bbc66de7ab1d14d89c870b69d Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 16 Dec 2011 13:41:37 -0800 Subject: [PATCH] --- yaml --- r: 281399 b: refs/heads/master c: c001dff0f6715813bdb8e978dc8c05416c01962b h: refs/heads/master i: 281397: 6792097b108c74576322ba1cdbc81769d9c0e3b3 281395: b60b2ec32abc4a3f4b057b3a0d49d0216b59bce0 281391: f75a5d3cc516613dfe27b5e6fe3aa9b8ff744991 v: v3 --- [refs] | 2 +- trunk/drivers/staging/android/switch/switch.h | 2 +- trunk/drivers/staging/android/switch/switch_gpio.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 499996487f1f..263c1deb8138 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e0f5bb9b3850bdd7907eda9eb923cd3f9d4358b8 +refs/heads/master: c001dff0f6715813bdb8e978dc8c05416c01962b diff --git a/trunk/drivers/staging/android/switch/switch.h b/trunk/drivers/staging/android/switch/switch.h index 3e4c748e343a..4fcb3109875a 100644 --- a/trunk/drivers/staging/android/switch/switch.h +++ b/trunk/drivers/staging/android/switch/switch.h @@ -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; diff --git a/trunk/drivers/staging/android/switch/switch_gpio.c b/trunk/drivers/staging/android/switch/switch_gpio.c index 6ba8d97e6bd1..38b2c2f6004e 100644 --- a/trunk/drivers/staging/android/switch/switch_gpio.c +++ b/trunk/drivers/staging/android/switch/switch_gpio.c @@ -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; @@ -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); @@ -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;