* [PATCH v2 1/1] Input: max8997_haptic - Check return values
@ 2014-06-02 10:24 Sachin Kamat
2014-06-08 6:12 ` Dmitry Torokhov
0 siblings, 1 reply; 3+ messages in thread
From: Sachin Kamat @ 2014-06-02 10:24 UTC (permalink / raw)
To: linux-input; +Cc: dmitry.torokhov, sachin.kamat, Donggeun Kim
Check the return value of regulator_enable and pwm_enable to
avoid errors.
Fixes the following warning:
drivers/input/misc/max8997_haptic.c:185:19: warning: ignoring return value of ‘regulator_enable’, declared with attribute warn_unused_result [-Wunused-result]
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Cc: Donggeun Kim <dg77.kim@samsung.com>
---
Changes since v1:
* checked the return value of pwm_enable as suggested by Dmitry.
* Make chip->enabled = true only if enablement is
successful.
---
drivers/input/misc/max8997_haptic.c | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/drivers/input/misc/max8997_haptic.c b/drivers/input/misc/max8997_haptic.c
index 1fea5484941f..11f4d84625b3 100644
--- a/drivers/input/misc/max8997_haptic.c
+++ b/drivers/input/misc/max8997_haptic.c
@@ -181,11 +181,20 @@ static void max8997_haptic_enable(struct max8997_haptic *chip)
}
if (!chip->enabled) {
- chip->enabled = true;
- regulator_enable(chip->regulator);
+ error = regulator_enable(chip->regulator);
+ if (error) {
+ dev_err(chip->dev, "Failed to enable regulator\n");
+ goto out;
+ }
max8997_haptic_configure(chip);
- if (chip->mode == MAX8997_EXTERNAL_MODE)
- pwm_enable(chip->pwm);
+ if (chip->mode == MAX8997_EXTERNAL_MODE) {
+ error = pwm_enable(chip->pwm);
+ if (error) {
+ dev_err(chip->dev, "Failed to enable PWM\n");
+ goto out;
+ }
+ }
+ chip->enabled = true;
}
out:
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH v2 1/1] Input: max8997_haptic - Check return values
2014-06-02 10:24 [PATCH v2 1/1] Input: max8997_haptic - Check return values Sachin Kamat
@ 2014-06-08 6:12 ` Dmitry Torokhov
2014-06-09 4:02 ` Sachin Kamat
0 siblings, 1 reply; 3+ messages in thread
From: Dmitry Torokhov @ 2014-06-08 6:12 UTC (permalink / raw)
To: Sachin Kamat; +Cc: linux-input, Donggeun Kim
On Mon, Jun 02, 2014 at 03:54:03PM +0530, Sachin Kamat wrote:
> Check the return value of regulator_enable and pwm_enable to
> avoid errors.
> Fixes the following warning:
> drivers/input/misc/max8997_haptic.c:185:19: warning: ignoring return value of ‘regulator_enable’, declared with attribute warn_unused_result [-Wunused-result]
>
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
> Cc: Donggeun Kim <dg77.kim@samsung.com>
> ---
> Changes since v1:
> * checked the return value of pwm_enable as suggested by Dmitry.
> * Make chip->enabled = true only if enablement is
> successful.
> ---
> drivers/input/misc/max8997_haptic.c | 17 +++++++++++++----
> 1 file changed, 13 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/input/misc/max8997_haptic.c b/drivers/input/misc/max8997_haptic.c
> index 1fea5484941f..11f4d84625b3 100644
> --- a/drivers/input/misc/max8997_haptic.c
> +++ b/drivers/input/misc/max8997_haptic.c
> @@ -181,11 +181,20 @@ static void max8997_haptic_enable(struct max8997_haptic *chip)
> }
>
> if (!chip->enabled) {
> - chip->enabled = true;
> - regulator_enable(chip->regulator);
> + error = regulator_enable(chip->regulator);
> + if (error) {
> + dev_err(chip->dev, "Failed to enable regulator\n");
> + goto out;
> + }
> max8997_haptic_configure(chip);
> - if (chip->mode == MAX8997_EXTERNAL_MODE)
> - pwm_enable(chip->pwm);
> + if (chip->mode == MAX8997_EXTERNAL_MODE) {
> + error = pwm_enable(chip->pwm);
> + if (error) {
> + dev_err(chip->dev, "Failed to enable PWM\n");
I think we should also disable regulator here, I'll add it.
> + goto out;
> + }
> + }
> + chip->enabled = true;
> }
>
> out:
> --
> 1.7.9.5
>
--
Dmitry
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH v2 1/1] Input: max8997_haptic - Check return values
2014-06-08 6:12 ` Dmitry Torokhov
@ 2014-06-09 4:02 ` Sachin Kamat
0 siblings, 0 replies; 3+ messages in thread
From: Sachin Kamat @ 2014-06-09 4:02 UTC (permalink / raw)
To: Dmitry Torokhov; +Cc: Sachin Kamat, linux-input, Donggeun Kim
On Sun, Jun 8, 2014 at 11:42 AM, Dmitry Torokhov
<dmitry.torokhov@gmail.com> wrote:
> On Mon, Jun 02, 2014 at 03:54:03PM +0530, Sachin Kamat wrote:
>> Check the return value of regulator_enable and pwm_enable to
>> avoid errors.
>> Fixes the following warning:
>> drivers/input/misc/max8997_haptic.c:185:19: warning: ignoring return value of ‘regulator_enable’, declared with attribute warn_unused_result [-Wunused-result]
>>
>> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
>> Cc: Donggeun Kim <dg77.kim@samsung.com>
>> ---
>> Changes since v1:
>> * checked the return value of pwm_enable as suggested by Dmitry.
>> * Make chip->enabled = true only if enablement is
>> successful.
>> ---
>> drivers/input/misc/max8997_haptic.c | 17 +++++++++++++----
>> 1 file changed, 13 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/input/misc/max8997_haptic.c b/drivers/input/misc/max8997_haptic.c
>> index 1fea5484941f..11f4d84625b3 100644
>> --- a/drivers/input/misc/max8997_haptic.c
>> +++ b/drivers/input/misc/max8997_haptic.c
>> @@ -181,11 +181,20 @@ static void max8997_haptic_enable(struct max8997_haptic *chip)
>> }
>>
>> if (!chip->enabled) {
>> - chip->enabled = true;
>> - regulator_enable(chip->regulator);
>> + error = regulator_enable(chip->regulator);
>> + if (error) {
>> + dev_err(chip->dev, "Failed to enable regulator\n");
>> + goto out;
>> + }
>> max8997_haptic_configure(chip);
>> - if (chip->mode == MAX8997_EXTERNAL_MODE)
>> - pwm_enable(chip->pwm);
>> + if (chip->mode == MAX8997_EXTERNAL_MODE) {
>> + error = pwm_enable(chip->pwm);
>> + if (error) {
>> + dev_err(chip->dev, "Failed to enable PWM\n");
>
> I think we should also disable regulator here, I'll add it.
Right. Thanks for fixing it, Dmitry.
Regards,
Sachin.
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-06-09 4:02 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-06-02 10:24 [PATCH v2 1/1] Input: max8997_haptic - Check return values Sachin Kamat
2014-06-08 6:12 ` Dmitry Torokhov
2014-06-09 4:02 ` Sachin Kamat
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).