diff options
| author |   Jason Gerecke <killertofu@gmail.com> | 2015-07-13 18:03:45 -0700 |
|---|---|---|
| committer |   Jiri Kosina <jkosina@suse.com> | 2015-07-17 11:25:20 +0200 |
| commit | 2bdd163cfd262914e8f6152e37aebea2034f801e (patch) | |
| tree | 7f7d1800b7a71040427ee6454b9aef1a1ccab59f /drivers/hid | |
| parent | HID: wacom: Properly free inputs if 'wacom_allocate_inputs' fails (diff) | |
| download | linux-dev-2bdd163cfd262914e8f6152e37aebea2034f801e.tar.xz linux-dev-2bdd163cfd262914e8f6152e37aebea2034f801e.zip | |
HID: wacom: Set default device name to value from wacom->features
Allocated input devices should not use the 'pen_name' by default since
we do not know at that point in time if that is an appropriate choice
of name. Instead, use the (tool-agnostic) name that is stored in the
device's 'wacom_features' structure. This also has the nice side-effect
of requring us to be explicit about the naming of the pen device, as
we already are for touch and pad devices.
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
Signed-off-by: Jiri Kosina <jkosina@suse.com>
Diffstat (limited to 'drivers/hid')
| -rw-r--r-- | drivers/hid/wacom_sys.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c index 3512d833cc24..2a221630d8dc 100644 --- a/drivers/hid/wacom_sys.c +++ b/drivers/hid/wacom_sys.c @@ -1130,7 +1130,7 @@ static struct input_dev *wacom_allocate_input(struct wacom *wacom) if (!input_dev) return NULL; - input_dev->name = wacom_wac->pen_name; + input_dev->name = wacom_wac->features.name; input_dev->phys = hdev->phys; input_dev->dev.parent = &hdev->dev; input_dev->open = wacom_open; @@ -1183,6 +1183,7 @@ static int wacom_allocate_inputs(struct wacom *wacom) return -ENOMEM; } + wacom_wac->pen_input->name = wacom_wac->pen_name; wacom_wac->touch_input->name = wacom_wac->touch_name; wacom_wac->pad_input->name = wacom_wac->pad_name; |