Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge for-5.4 on to master #120

Merged
merged 6 commits into from
Sep 18, 2019
Merged

merge for-5.4 on to master #120

merged 6 commits into from
Sep 18, 2019

Commits on Aug 20, 2019

  1. HID: wacom: Fix several minor compiler warnings

    Addresses a few issues that were noticed when compiling with non-default
    warnings enabled. The trimmed-down warnings in the order they are fixed
    below are:
    
    * declaration of 'size' shadows a parameter
    
    * '%s' directive output may be truncated writing up to 5 bytes into a
      region of size between 1 and 64
    
    * pointer targets in initialization of 'char *' from 'unsigned char *'
      differ in signedness
    
    * left shift of negative value
    
    Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
    Reviewed-by: Aaron Armstrong Skomra <aaron.skomra@wacom.com>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>
    [jason.gerecke@wacom.com: Imported into input-wacom repository (073b50bccbbf)]
    Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
    jigpu committed Aug 20, 2019
    Configuration menu
    Copy the full SHA
    2cdfc1c View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2019

  1. Input: wacom_w8001 - allocate additional space for 'phys'

    GCC warns that the output of our call to 'snprintf' in 'w8001_connect'
    may be truncated since both 'serio->phys' and 'w8001->phys' are 32 bytes
    in length. Increase the amount of space allocated for the latter to
    compensate.
    
    Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
    Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
    [jason.gerecke@wacom.com: Imported into input-wacom repository (2da9d2b5b9d6)]
    Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
    jigpu committed Aug 21, 2019
    Configuration menu
    Copy the full SHA
    b9ee357 View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2019

  1. HID: wacom: support named keys on older devices

    Some Wacom devices have keys with predefined meanings. However, when
    support was originally added for these devices, the codes for these
    keys were not available yet. These keys were thus reported with
    the numbered KEY_PROG* range.
    
    Some missing key codes were added with commit 4eb220cb35a9 ("HID:
    wacom: generic: add 3 tablet touch keys") and we are now able to
    report the proper key codes. We continue to report the original
    KEY_PROG codes so as not to break any unknown applications that
    may depend on them.
    
    Also, to support the touch key, track its state in the pad report.
    
    Signed-off-by: Aaron Armstrong Skomra <aaron.skomra@wacom.com>
    Link: https://gitlab.freedesktop.org/libinput/libinput/merge_requests/155
    Link: linuxwacom/xf86-input-wacom#46
    Reviewed-by: Ping Cheng <ping.cheng@wacom.com>
    Reviewed-by: Jason Gerecke <jason.gerecke@wacom.com>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>
    [aaron.skomra@wacom.com: Imported into input-wacom repository (670e90924bfe)]
    Signed-off-by: Aaron Armstrong Skomra <aaron.skomra@wacom.com>
    skomra committed Aug 23, 2019
    Configuration menu
    Copy the full SHA
    ea97cd0 View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2019

  1. HID: wacom: do not call hid_set_drvdata(hdev, NULL)

    This is a common pattern in the HID drivers to reset the drvdata.
    However, this is actually already handled by driver core, so there
    is no need to do it manually.
    
    Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
    Acked-by: Jason Gerecke <jason.gerecke@wacom.com>
    [jason.gerecke@wacom.com: Imported into input-wacom repository (362c571b92e2)]
    Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
    bentiss authored and jigpu committed Sep 3, 2019
    Configuration menu
    Copy the full SHA
    5d053dc View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2019

  1. HID: wacom: add new MobileStudio Pro 13 support

    wacom_wac_pad_event is the only routine we need to update.
    
    Signed-off-by: Ping Cheng <ping.cheng@wacom.com>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>
    [ping.cheng@wacom.com: Imported into input-wacom repository (bbbe3ac8f943)]
    Signed-off-by: Ping Cheng <ping.cheng@wacom.com>
    Pinglinux authored and Ping Cheng committed Sep 5, 2019
    Configuration menu
    Copy the full SHA
    c7005ad View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2019

  1. Configuration menu
    Copy the full SHA
    166995a View commit details
    Browse the repository at this point in the history