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

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

Merge "adreno_tz: Correct tz_buf pointer type to correct pointer arithmetic"

parents 520c2d89 26c2644b

drivers/devfreq/governor_msm_adreno_tz.c

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

/* Copyright (c) 2010-2017, 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
@@ -234,7 +234,7 @@ static int tz_init_ca(struct devfreq_msm_adreno_tz_data *priv) 
{

	unsigned int tz_ca_data[2];

	struct scm_desc desc = {0};

	unsigned int *tz_buf;

	u8 *tz_buf;

	int ret;



	/* Set data for TZ */
@@ -279,7 +279,7 @@ static int tz_init(struct devfreq_msm_adreno_tz_data *priv, 
			scm_is_call_available(SCM_SVC_DCVS, TZ_UPDATE_ID_64) &&

			scm_is_call_available(SCM_SVC_DCVS, TZ_RESET_ID_64)) {

		struct scm_desc desc = {0};

		unsigned int *tz_buf;

		u8 *tz_buf;



		if (!is_scm_armv8()) {

			ret = scm_call(SCM_SVC_DCVS, TZ_INIT_ID_64,