Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed38f483 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "power: qpnp-fg-gen4: Fix missing printk argument"

parents 1287144c 83fadb15

drivers/power/supply/qcom/qpnp-fg-gen4.c

+2 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2018 The Linux Foundation. All rights reserved.

 * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.

 */



#define pr_fmt(fmt)	"FG: %s: " fmt, __func__
@@ -1027,7 +1027,7 @@ static int fg_gen4_store_count(void *data, u16 *buf, int id, int length) 
	rc = fg_sram_write(&chip->fg, CYCLE_COUNT_WORD + id, CYCLE_COUNT_OFFSET,

			(u8 *)buf, length, FG_IMA_DEFAULT);

	if (rc < 0)

		pr_err("failed to write bucket %d rc=%d\n", rc);

		pr_err("failed to write bucket %d rc=%d\n", id, rc);



	return rc;

}

drivers/power/supply/qcom/smb1390-charger-psy.c

+2 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2017-2018 The Linux Foundation. All rights reserved.

 * Copyright (c) 2017-2019 The Linux Foundation. All rights reserved.

 */



#define pr_fmt(fmt) "SMB1390: %s: " fmt, __func__
@@ -771,7 +771,7 @@ static int smb1390_parse_dt(struct smb1390 *chip) 
			rc = PTR_ERR(chip->iio.die_temp_chan);

			if (rc != -EPROBE_DEFER)

				dev_err(chip->dev,

					"cp_die_temp channel unavailable %ld\n",

					"cp_die_temp channel unavailable %d\n",

					rc);

			chip->iio.die_temp_chan = NULL;

			return rc;