lkml.org 
[lkml]   [2012]   [Feb]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] HID: wacom: Fix invalid power_supply_powers calls
On Sun, 5 Feb 2012, Przemo Firszt wrote:

> power_supply_powers calls added in 35b4c01e29bdd9632dabf9784ed3486333f00427
> have to be called after power device is created. This patch also fixes the
> second call - it has to be "ac" instead of "battery"
>
> Signed-off-by: Przemo Firszt <przemo@firszt.eu>
> Signed-off-by: Chris Bagwell <chris@cnpbagwell.com>

[ adding Jeremy to CC ]

> ---
> drivers/hid/hid-wacom.c | 7 ++++---
> 1 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/hid/hid-wacom.c b/drivers/hid/hid-wacom.c
> index b47e58b..acab74c 100644
> --- a/drivers/hid/hid-wacom.c
> +++ b/drivers/hid/hid-wacom.c
> @@ -531,7 +531,6 @@ static int wacom_probe(struct hid_device *hdev,
> wdata->battery.type = POWER_SUPPLY_TYPE_BATTERY;
> wdata->battery.use_for_apm = 0;
>
> - power_supply_powers(&wdata->battery, &hdev->dev);
>
> ret = power_supply_register(&hdev->dev, &wdata->battery);
> if (ret) {
> @@ -540,6 +539,8 @@ static int wacom_probe(struct hid_device *hdev,
> goto err_battery;
> }
>
> + power_supply_powers(&wdata->battery, &hdev->dev);
> +
> wdata->ac.properties = wacom_ac_props;
> wdata->ac.num_properties = ARRAY_SIZE(wacom_ac_props);
> wdata->ac.get_property = wacom_ac_get_property;
> @@ -547,14 +548,14 @@ static int wacom_probe(struct hid_device *hdev,
> wdata->ac.type = POWER_SUPPLY_TYPE_MAINS;
> wdata->ac.use_for_apm = 0;
>
> - power_supply_powers(&wdata->battery, &hdev->dev);
> -
> ret = power_supply_register(&hdev->dev, &wdata->ac);
> if (ret) {
> hid_warn(hdev,
> "can't create ac battery attribute, err: %d\n", ret);
> goto err_ac;
> }
> +
> + power_supply_powers(&wdata->ac, &hdev->dev);
> #endif
> return 0;

Hmm, seems valid. How did you notice? Have you seen crashes because of
wild pointers?

Thanks,

--
Jiri Kosina
SUSE Labs


\
 
 \ /
  Last update: 2012-02-06 13:29    [from the cache]
©2003-2014 Jasper Spaans. Advertise on this site