diff options
| author | Olof Johansson <olof@lixom.net> | 2019-09-29 21:19:18 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2019-09-29 21:20:41 +0300 |
| commit | a4207a1c5edc3112b3538769024c7b2ad42b9fe9 (patch) | |
| tree | 739b56fe8aba751719cb7c19f528ce2bd0093f24 /drivers/firmware/arm_scmi/power.c | |
| parent | b74d957f6317e60924d0d3c0c01750814c24611b (diff) | |
| parent | 61423712dbb86e02af4aa5de65b9041493c92cac (diff) | |
| download | linux-a4207a1c5edc3112b3538769024c7b2ad42b9fe9.tar.xz | |
Merge tag 'scmi-fixes-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into arm/fixes
ARM SCMI fixes for v5.4
Couple of fixes: one in scmi reset driver initialising missed scmi handle
and an other in scmi reset API implementation fixing the assignment of
reset state
* tag 'scmi-fixes-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux:
reset: reset-scmi: add missing handle initialisation
firmware: arm_scmi: reset: fix reset_state assignment in scmi_domain_reset
Link: https://lore.kernel.org/r/20190918142139.GA4370@bogus
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/firmware/arm_scmi/power.c')
| -rw-r--r-- | drivers/firmware/arm_scmi/power.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/firmware/arm_scmi/power.c b/drivers/firmware/arm_scmi/power.c index 62f3401a1f01..5abef7079c0a 100644 --- a/drivers/firmware/arm_scmi/power.c +++ b/drivers/firmware/arm_scmi/power.c @@ -96,7 +96,7 @@ scmi_power_domain_attributes_get(const struct scmi_handle *handle, u32 domain, if (ret) return ret; - *(__le32 *)t->tx.buf = cpu_to_le32(domain); + put_unaligned_le32(domain, t->tx.buf); attr = t->rx.buf; ret = scmi_do_xfer(handle, t); @@ -147,11 +147,11 @@ scmi_power_state_get(const struct scmi_handle *handle, u32 domain, u32 *state) if (ret) return ret; - *(__le32 *)t->tx.buf = cpu_to_le32(domain); + put_unaligned_le32(domain, t->tx.buf); ret = scmi_do_xfer(handle, t); if (!ret) - *state = le32_to_cpu(*(__le32 *)t->rx.buf); + *state = get_unaligned_le32(t->rx.buf); scmi_xfer_put(handle, t); return ret; |