diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-12-29 04:10:54 +0300 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-12-29 04:10:54 +0300 |
| commit | 592b15ba7260f8dec8bfc71ef0ea1934801a35aa (patch) | |
| tree | 51ead1b83e10da0cf6623116f37a15bc142f9d8b /drivers/input/touchscreen/atmel_mxt_ts.c | |
| parent | 7db54c89f0b30a101584e09d3729144e6170059d (diff) | |
| parent | 1e3c336ad8f40f88a8961c434640920fe35cc08b (diff) | |
| download | linux-592b15ba7260f8dec8bfc71ef0ea1934801a35aa.tar.xz | |
Merge branch 'next' into for-linus
Prepare input updates for 4.21 merge window.
Diffstat (limited to 'drivers/input/touchscreen/atmel_mxt_ts.c')
| -rw-r--r-- | drivers/input/touchscreen/atmel_mxt_ts.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c index d3aacd534e9c..5c63d25ce84e 100644 --- a/drivers/input/touchscreen/atmel_mxt_ts.c +++ b/drivers/input/touchscreen/atmel_mxt_ts.c @@ -1585,10 +1585,10 @@ static int mxt_update_cfg(struct mxt_data *data, const struct firmware *fw) /* T7 config may have changed */ mxt_init_t7_power_cfg(data); -release_raw: - kfree(cfg.raw); release_mem: kfree(cfg.mem); +release_raw: + kfree(cfg.raw); return ret; } |