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

Commit 55fde908 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 11ccc6de on remote branch 

Change-Id: I83e2ad4b580a190dc27e48bc4804657b1d8b5353
parents 729ae003 11ccc6de

arch/arm/boot/dts/qcom/apq8053-lite-dragon.dtsi

+2 −2
Original line number Diff line number Diff line 
/*

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

 * Copyright (c) 2015-2019, 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
@@ -377,7 +377,7 @@ 


	pinctrl-names = "active", "sleep";

	pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on \

			&sdc2_cd_on &sdc2_wlan_gpio_on>;

			&sdc2_wlan_gpio_on>;

	pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off \

			&sdc2_wlan_gpio_off>;

arch/arm64/configs/apq8053_IoE-perf_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -546,7 +546,6 @@ CONFIG_MSM_SYSMON_COMM=y 
CONFIG_MSM_PIL=y

CONFIG_MSM_PIL_SSR_GENERIC=y

CONFIG_MSM_PIL_MSS_QDSP6V5=y

CONFIG_ICNSS=y

CONFIG_MSM_BAM_DMUX=y

CONFIG_MSM_PERFORMANCE=y

CONFIG_MSM_KERNEL_PROTECT=y

arch/arm64/configs/msmcortex-perf_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -568,7 +568,6 @@ CONFIG_MSM_SYSMON_COMM=y 
CONFIG_MSM_PIL=y

CONFIG_MSM_PIL_SSR_GENERIC=y

CONFIG_MSM_PIL_MSS_QDSP6V5=y

CONFIG_ICNSS=y

CONFIG_MSM_BAM_DMUX=y

CONFIG_MSM_PERFORMANCE=y

CONFIG_MSM_KERNEL_PROTECT=y

arch/arm64/configs/msmcortex_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -596,7 +596,6 @@ CONFIG_MSM_PIL=y 
CONFIG_MSM_PIL_SSR_GENERIC=y

CONFIG_MSM_PIL_MSS_QDSP6V5=y

CONFIG_TRACER_PKT=y

CONFIG_ICNSS=y

CONFIG_MSM_BAM_DMUX=y

CONFIG_MSM_PERFORMANCE=y

CONFIG_MSM_KERNEL_PROTECT=y

drivers/char/diag/diag_dci.c

+5 −0
Original line number Diff line number Diff line
@@ -1978,6 +1978,11 @@ static int diag_process_dci_pkt_rsp(unsigned char *buf, int len) 
	if ((ret == DIAG_DCI_NO_ERROR && !common_cmd) || ret < 0)

		return ret;



	reg_entry.cmd_code = 0;

	reg_entry.subsys_id = 0;

	reg_entry.cmd_code_hi = 0;

	reg_entry.cmd_code_lo = 0;



	if (header_len >= (sizeof(uint8_t)))

		reg_entry.cmd_code = header->cmd_code;

	if (header_len >= (2 * sizeof(uint8_t)))