diff options
| author | Andrey Zhizhikin <andrey.z@gmail.com> | 2020-08-11 08:11:29 +0000 |
|---|---|---|
| committer | Andrey Zhizhikin <andrey.z@gmail.com> | 2020-08-11 08:11:29 +0000 |
| commit | 1e70c7255a572e917dff8c5f3fe49dca0e5fa815 (patch) | |
| tree | 8fae9dc92e2fef8d5c847d31e960650edb6b143b /drivers/base | |
| parent | 6ae0a6e3c2e959d4b96c49e5d6aa475ed6932c43 (diff) | |
| parent | e75220890bf6b37c5f7b1dbd81d8292ed6d96643 (diff) | |
Merge tag 'v5.4.50' into 5.4-2.1.x-imx
This is the 5.4.50 stable release
Conflicts (manual resolve):
arch/arm64/boot/dts/freescale/imx8mm-evk.dts:
arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk.dts:
NXP patches kept to provide proper LDO setup:
imx8mm-evk.dts: 975d8ab07267ded741c4c5d7500e524c85ab40d3
imx8mn-ddr4-evk.dts: e8e35fd0e759965809f3dca5979a908a09286198
drivers/net/ethernet/freescale/enetc/enetc.c
Commit [ce06fcb6a66d22b080385768113ee28bf3593984] from upstream merged,
base NXP version kept
drivers/usb/cdns3/ep0.c
Manual merge of commit [be8df027079b856a89e85778330394cea2b0b290] from
upstream to protect cdns3_check_new_setup
Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/regmap/regmap.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c index f76e4e879e50..45b600ee4f29 100644 --- a/drivers/base/regmap/regmap.c +++ b/drivers/base/regmap/regmap.c @@ -1354,6 +1354,7 @@ void regmap_exit(struct regmap *map) if (map->hwlock) hwspin_lock_free(map->hwlock); kfree_const(map->name); + kfree(map->patch); kfree(map); } EXPORT_SYMBOL_GPL(regmap_exit); |