Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Sat, 20 Jul 2019 04:07:56 +0000 (07:07 +0300)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Sat, 20 Jul 2019 04:07:56 +0000 (07:07 +0300)
Prepare second round of input updates for 5.3 merge window.

drivers/input/mouse/synaptics.c
drivers/input/touchscreen/atmel_mxt_ts.c

index b77b18c9ad024c09fee7cebd2aeb77ab12521a8a..b1956ed4c0ddeaf35b1f3cf65c0773e851a7c07d 100644 (file)
@@ -173,6 +173,7 @@ static const char * const smbus_pnp_ids[] = {
        "LEN0072", /* X1 Carbon Gen 5 (2017) - Elan/ALPS trackpoint */
        "LEN0073", /* X1 Carbon G5 (Elantech) */
        "LEN0092", /* X1 Carbon 6 */
+       "LEN0093", /* T480 */
        "LEN0096", /* X280 */
        "LEN0097", /* X280 -> ALPS trackpoint */
        "LEN009b", /* T580 */
index 0dae381c663763a41218d284006684676bc751d0..4a5f482cf1af5550e6f504b11c3bdf44d4319b67 100644 (file)
@@ -1511,7 +1511,8 @@ static int mxt_update_cfg(struct mxt_data *data, const struct firmware *fw)
                } else if (config_crc == data->config_crc) {
                        dev_dbg(dev, "Config CRC 0x%06X: OK\n",
                                 data->config_crc);
-                       return 0;
+                       ret = 0;
+                       goto release_raw;
                } else {
                        dev_info(dev, "Config CRC 0x%06X: does not match file 0x%06X\n",
                                 data->config_crc, config_crc);