diff options
| author | Andrey Zhizhikin <andrey.z@gmail.com> | 2020-08-11 11:43:33 +0000 |
|---|---|---|
| committer | Andrey Zhizhikin <andrey.z@gmail.com> | 2020-08-11 12:38:27 +0000 |
| commit | 7e95371996e8edee2df29cc0eb6379a97ffb802d (patch) | |
| tree | 97fd262a9c0bb91c1f007d3b20508d0982b07fa8 /drivers/soc | |
| parent | 14eec8a71c3e212080803c50cd9d7982e8208ec5 (diff) | |
| parent | 58a12e3368dbcadc57c6b3f5fcbecce757426f02 (diff) | |
Merge tag 'v5.4.54' into 5.4-2.1.x-imx
This is the 5.4.54 stable release
Conflicts:
drivers/net/ethernet/freescale/enetc/enetc_pf.c
Commit [e8b86b4d87e3abe890ca91f12f8e43fef75bbddc] from upstream solves
the kernel panic in case if probing fails. NXP has a clean-up logic
implemented different, where the MDIO remove would be invoked in any
failure case. Keep the NXP logic in place.
drivers/usb/cdns3/ep0.c
Merge commit [103a90ad4e647dd6e4d4e149dc2edf8744c2bc4d] from upstream
to handle endian misalignments respectively.
Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
Diffstat (limited to 'drivers/soc')
| -rw-r--r-- | drivers/soc/qcom/rpmh.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/soc/qcom/rpmh.c b/drivers/soc/qcom/rpmh.c index ae2d1590a611..13e1b450f296 100644 --- a/drivers/soc/qcom/rpmh.c +++ b/drivers/soc/qcom/rpmh.c @@ -150,10 +150,10 @@ existing: break; } - ctrlr->dirty = (req->sleep_val != old_sleep_val || - req->wake_val != old_wake_val) && - req->sleep_val != UINT_MAX && - req->wake_val != UINT_MAX; + ctrlr->dirty |= (req->sleep_val != old_sleep_val || + req->wake_val != old_wake_val) && + req->sleep_val != UINT_MAX && + req->wake_val != UINT_MAX; unlock: spin_unlock_irqrestore(&ctrlr->cache_lock, flags); |