Looks good. Do you know if this has made it into a released kernel or only in an RC?
If the former, you'll probably want to Cc: the stable email address in addition to linux-input; but I forget what that address is right now. But I think this is only in RC's. Chris On Sun, Feb 5, 2012 at 1:23 PM, Przemo Firszt <[email protected]> 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 <[email protected]> > --- > 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; > > -- > 1.7.6.4 > ------------------------------------------------------------------------------ Try before you buy = See our experts in action! The most comprehensive online learning library for Microsoft developers is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, Metro Style Apps, more. Free future releases when you subscribe now! http://p.sf.net/sfu/learndevnow-dev2 _______________________________________________ Linuxwacom-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
