diff options
| author | Michael Bestas <mkbestas@lineageos.org> | 2021-07-22 01:41:57 +0300 |
|---|---|---|
| committer | Michael Bestas <mkbestas@lineageos.org> | 2021-07-22 01:41:57 +0300 |
| commit | e5c348556ec23d17f1f91f838a9c45509ad6c0bc (patch) | |
| tree | 01724a82b5b5d4c7950d394f18dc6215792900fa /include/linux | |
| parent | 2d7cd12108a230357a2699aa864f9f6897d3e599 (diff) | |
| parent | 954d3318ebc1b79dc469995450b23c30ce44b6af (diff) | |
Merge remote-tracking branch 'msm8998/lineage-18.1' into lineage-18.1
Change-Id: I2dea08b7be4049f0a4165801d223fff2a732e067
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mfd/abx500/ux500_chargalg.h | 2 | ||||
| -rw-r--r-- | include/linux/prandom.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/mfd/abx500/ux500_chargalg.h b/include/linux/mfd/abx500/ux500_chargalg.h index 67703f23e7ba..821a3b9bc16e 100644 --- a/include/linux/mfd/abx500/ux500_chargalg.h +++ b/include/linux/mfd/abx500/ux500_chargalg.h @@ -15,7 +15,7 @@ * - POWER_SUPPLY_TYPE_USB, * because only them store as drv_data pointer to struct ux500_charger. */ -#define psy_to_ux500_charger(x) power_supply_get_drvdata(psy) +#define psy_to_ux500_charger(x) power_supply_get_drvdata(x) /* Forward declaration */ struct ux500_charger; diff --git a/include/linux/prandom.h b/include/linux/prandom.h index cc1e71334e53..e20339c78a84 100644 --- a/include/linux/prandom.h +++ b/include/linux/prandom.h @@ -93,7 +93,7 @@ static inline u32 __seed(u32 x, u32 m) */ static inline void prandom_seed_state(struct rnd_state *state, u64 seed) { - u32 i = (seed >> 32) ^ (seed << 10) ^ seed; + u32 i = ((seed >> 32) ^ (seed << 10) ^ seed) & 0xffffffffUL; state->s1 = __seed(i, 2U); state->s2 = __seed(i, 8U); |