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

Commit 7961b26b authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "power: qpnp-fg-gen3: Fix warning with llvm"

parents bf90030a 13450342

drivers/misc/lkdtm.c

+1 −1
Original line number Diff line number Diff line
@@ -348,7 +348,7 @@ static noinline void corrupt_stack(void) 
	/* Use default char array length that triggers stack protection. */

	char data[8];



	memset((void *)data, 0, 64);

	memset((void *)data, 0, sizeof(char)*8);

}



static void execute_location(void *dst)

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

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2016-2020, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -2608,7 +2608,7 @@ static void clear_cycle_counter(struct fg_chip *chip) 
	}

	rc = fg_sram_write(chip, CYCLE_COUNT_WORD, CYCLE_COUNT_OFFSET,

			(u8 *)&chip->cyc_ctr.count,

			sizeof(chip->cyc_ctr.count) / sizeof(u8 *),

			sizeof(chip->cyc_ctr.count) / (sizeof(u8 *)),

			FG_IMA_DEFAULT);

	if (rc < 0)

		pr_err("failed to clear cycle counter rc=%d\n", rc);