From: Przemo Firszt <przemo@firszt.eu>
To: Axel Lin <axel.lin@gmail.com>
Cc: Jiri Kosina <jkosina@suse.cz>, Ping Cheng <pingc@wacom.com>,
linux-input@vger.kernel.org
Subject: Re: [PATCH v2] HID: wacom: Fix wacom_probe error handling
Date: Tue, 18 Sep 2012 23:09:06 +0100 [thread overview]
Message-ID: <1348006146.1991.1.camel@localhost> (raw)
In-Reply-To: <1347872034.7737.4.camel@phoenix>
On Mon, 2012-09-17 at 16:53 +0800, Axel Lin wrote:
> OLEDs/LED are not critical for tablet functioning thus ignore OLED/LED
> initialisation failures.
>
> This patch does clean up all the sysfs attribute files in error paths.
>
> Signed-off-by: Axel Lin <axel.lin@gmail.com>
> ---
> drivers/hid/hid-wacom.c | 23 ++++++++++++++---------
> 1 file changed, 14 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/hid/hid-wacom.c b/drivers/hid/hid-wacom.c
> index a0fafac..2f60da9 100644
> --- a/drivers/hid/hid-wacom.c
> +++ b/drivers/hid/hid-wacom.c
> @@ -858,11 +858,9 @@ OLED_INIT(7);
> if (hdev->product == USB_DEVICE_ID_WACOM_INTUOS4_BLUETOOTH) {
> sprintf(hdev->name, "%s", "Wacom Intuos4 WL");
> ret = wacom_initialize_leds(hdev);
> - if (ret) {
> + if (ret)
> hid_warn(hdev,
> "can't create led attribute, err: %d\n", ret);
> - goto destroy_leds;
> - }
> }
>
> wdata->battery.properties = wacom_battery_props;
> @@ -875,8 +873,8 @@ OLED_INIT(7);
>
> ret = power_supply_register(&hdev->dev, &wdata->battery);
> if (ret) {
> - hid_warn(hdev, "can't create sysfs battery attribute, err: %d\n",
> - ret);
> + hid_err(hdev, "can't create sysfs battery attribute, err: %d\n",
> + ret);
> goto err_battery;
> }
>
> @@ -891,8 +889,8 @@ OLED_INIT(7);
>
> ret = power_supply_register(&hdev->dev, &wdata->ac);
> if (ret) {
> - hid_warn(hdev,
> - "can't create ac battery attribute, err: %d\n", ret);
> + hid_err(hdev,
> + "can't create ac battery attribute, err: %d\n", ret);
> goto err_ac;
> }
>
> @@ -902,10 +900,17 @@ OLED_INIT(7);
> err_ac:
> power_supply_unregister(&wdata->battery);
> err_battery:
> + wacom_destroy_leds(hdev);
> + device_remove_file(&hdev->dev, &dev_attr_oled0_img);
> + device_remove_file(&hdev->dev, &dev_attr_oled1_img);
> + device_remove_file(&hdev->dev, &dev_attr_oled2_img);
> + device_remove_file(&hdev->dev, &dev_attr_oled3_img);
> + device_remove_file(&hdev->dev, &dev_attr_oled4_img);
> + device_remove_file(&hdev->dev, &dev_attr_oled5_img);
> + device_remove_file(&hdev->dev, &dev_attr_oled6_img);
> + device_remove_file(&hdev->dev, &dev_attr_oled7_img);
> device_remove_file(&hdev->dev, &dev_attr_speed);
> hid_hw_stop(hdev);
> -destroy_leds:
> - wacom_destroy_leds(hdev);
> err_free:
> kfree(wdata);
> return ret;
Tested-by: Przemo Firszt <przemo@firszt.eu>
next prev parent reply other threads:[~2012-09-18 22:09 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-17 8:53 [PATCH v2] HID: wacom: Fix wacom_probe error handling Axel Lin
2012-09-17 20:17 ` Ping Cheng
2012-09-18 22:09 ` Przemo Firszt [this message]
2012-09-19 11:42 ` Jiri Kosina
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1348006146.1991.1.camel@localhost \
--to=przemo@firszt.eu \
--cc=axel.lin@gmail.com \
--cc=jkosina@suse.cz \
--cc=linux-input@vger.kernel.org \
--cc=pingc@wacom.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).