Commit ce583d5f authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'for-v6.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply

Pull power supply fixes from Sebastian Reichel:

 - qcom_battmgr: endianness fixes

* tag 'for-v6.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply:
  power: supply: qcom_battmgr: fix enable request endianness
  power: supply: qcom_battmgr: fix battery_id type
parents 4ee22162 8894b432
...@@ -105,7 +105,7 @@ struct qcom_battmgr_property_request { ...@@ -105,7 +105,7 @@ struct qcom_battmgr_property_request {
struct qcom_battmgr_update_request { struct qcom_battmgr_update_request {
struct pmic_glink_hdr hdr; struct pmic_glink_hdr hdr;
u32 battery_id; __le32 battery_id;
}; };
struct qcom_battmgr_charge_time_request { struct qcom_battmgr_charge_time_request {
...@@ -1282,9 +1282,9 @@ static void qcom_battmgr_enable_worker(struct work_struct *work) ...@@ -1282,9 +1282,9 @@ static void qcom_battmgr_enable_worker(struct work_struct *work)
{ {
struct qcom_battmgr *battmgr = container_of(work, struct qcom_battmgr, enable_work); struct qcom_battmgr *battmgr = container_of(work, struct qcom_battmgr, enable_work);
struct qcom_battmgr_enable_request req = { struct qcom_battmgr_enable_request req = {
.hdr.owner = PMIC_GLINK_OWNER_BATTMGR, .hdr.owner = cpu_to_le32(PMIC_GLINK_OWNER_BATTMGR),
.hdr.type = PMIC_GLINK_NOTIFY, .hdr.type = cpu_to_le32(PMIC_GLINK_NOTIFY),
.hdr.opcode = BATTMGR_REQUEST_NOTIFICATION, .hdr.opcode = cpu_to_le32(BATTMGR_REQUEST_NOTIFICATION),
}; };
int ret; int ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment