On Wed, Mar 7, 2018 at 10:13 AM, Jason Gerecke <killert...@gmail.com> wrote:
> The commit which backported support for the One by Wacom to pre-3.17
> kernels forgot to populate the packet length field which is present
> on these older kernels, but not on the newer ones. The santy checks
> present at the beginning of "wacom_probe" fail when they come across
> the clearly-incorrect data, bailing out of the function with -EINVAL.
>
> Ref: https://sourceforge.net/p/linuxwacom/support-requests/54/
> Fixes: c6fc15ada5 ("backport: HID: wacom: Add support for One by Wacom
> (CTL-472 / CTL-672)")
> Signed-off-by: Jason Gerecke <jason.gere...@wacom.com>
>
No one complained. I guess "One by Wacom" users don't run old kernels ;).
Anyway,
Reviewed-by: Ping Cheng <ping.ch...@wacom.com>
Cheers,
Ping
---
> 2.6.30/wacom_wac.c | 4 ++--
> 2.6.38/wacom_wac.c | 4 ++--
> 3.7/wacom_wac.c | 4 ++--
> 3 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/2.6.30/wacom_wac.c b/2.6.30/wacom_wac.c
> index 2cf0f07..5b1fc90 100644
> --- a/2.6.30/wacom_wac.c
> +++ b/2.6.30/wacom_wac.c
> @@ -2920,10 +2920,10 @@ static const struct wacom_features
> wacom_features_0x368 =
> .type = DTH1152T, .touch_max = 10, .oVid = USB_VENDOR_ID_WACOM,
> .oPid = 0x35A }; /* Touch */
> static const struct wacom_features wacom_features_0x37A =
> - { "Wacom One by Wacom S", 15200, 9500, 2047, 63,
> + { "Wacom One by Wacom S", WACOM_PKGLEN_BBPEN, 15200, 9500, 2047,
> 63,
> BAMBOO_PT };
> static const struct wacom_features wacom_features_0x37B =
> - { "Wacom One by Wacom M", 21600, 13500, 2047, 63,
> + { "Wacom One by Wacom M", WACOM_PKGLEN_BBPEN, 21600, 13500, 2047,
> 63,
> BAMBOO_PT };
> static const struct wacom_features wacom_features_0x37C =
> { "Wacom Cintiq Pro 24", WACOM_PKGLEN_MSPRO, 105286, 59574, 8191,
> 63, /* Pen-only */
> diff --git a/2.6.38/wacom_wac.c b/2.6.38/wacom_wac.c
> index 7e08dde..07fb987 100644
> --- a/2.6.38/wacom_wac.c
> +++ b/2.6.38/wacom_wac.c
> @@ -3319,10 +3319,10 @@ static const struct wacom_features
> wacom_features_0x368 =
> .type = DTH1152T, .touch_max = 10, .oVid = USB_VENDOR_ID_WACOM,
> .oPid = 0x35A }; /* Touch */
> static const struct wacom_features wacom_features_0x37A =
> - { "Wacom One by Wacom S", 15200, 9500, 2047, 63,
> + { "Wacom One by Wacom S", WACOM_PKGLEN_BBPEN, 15200, 9500, 2047,
> 63,
> BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
> static const struct wacom_features wacom_features_0x37B =
> - { "Wacom One by Wacom M", 21600, 13500, 2047, 63,
> + { "Wacom One by Wacom M", WACOM_PKGLEN_BBPEN, 21600, 13500, 2047,
> 63,
> BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
> static const struct wacom_features wacom_features_0x37C =
> { "Wacom Cintiq Pro 24", WACOM_PKGLEN_MSPRO, 105286, 59574, 8191,
> 63, /* Pen-only */
> diff --git a/3.7/wacom_wac.c b/3.7/wacom_wac.c
> index a02d191..08da9de 100644
> --- a/3.7/wacom_wac.c
> +++ b/3.7/wacom_wac.c
> @@ -3249,10 +3249,10 @@ static const struct wacom_features
> wacom_features_0x368 =
> .type = DTH1152T, .touch_max = 10, .oVid = USB_VENDOR_ID_WACOM,
> .oPid = 0x35A }; /* Touch */
> static const struct wacom_features wacom_features_0x37A =
> - { "Wacom One by Wacom S", 15200, 9500, 2047, 63,
> + { "Wacom One by Wacom S", WACOM_PKGLEN_BBPEN, 15200, 9500, 2047,
> 63,
> BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
> static const struct wacom_features wacom_features_0x37B =
> - { "Wacom One by Wacom M", 21600, 13500, 2047, 63,
> + { "Wacom One by Wacom M", WACOM_PKGLEN_BBPEN, 21600, 13500, 2047,
> 63,
> BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
> static const struct wacom_features wacom_features_0x37C =
> { "Wacom Cintiq Pro 24", WACOM_PKGLEN_MSPRO, 105286, 59574, 8191,
> 63, /* Pen-only */
> --
> 2.16.2
>
>
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
