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

Commit 13ec54d0 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 02170baa on remote branch 

Change-Id: Iae94c8b91b1a8e126944716d1a78adcf736b1f49
parents b909054e 02170baa

drivers/char/adsprpc.c

+3 −3
Original line number Diff line number Diff line
@@ -3951,7 +3951,7 @@ static long fastrpc_device_ioctl(struct file *file, unsigned int ioctl_num, 
	} i;

	void *param = (char *)ioctl_param;

	struct fastrpc_file *fl = (struct fastrpc_file *)file->private_data;

	int size = 0, err = 0;

	int size = 0, err = 0, req_complete = 0;

	uint32_t info;

	static bool isQueryDone;
@@ -4155,8 +4155,8 @@ static long fastrpc_device_ioctl(struct file *file, unsigned int ioctl_num, 
		if (err)

			goto bail;

		if ((fl->cid == CDSP_DOMAIN_ID) && !isQueryDone) {

			err = fastrpc_update_cdsp_support(fl);

			if (!err)

			req_complete = fastrpc_update_cdsp_support(fl);

			if (!req_complete)

				isQueryDone = true;

		}

		break;

drivers/gpu/drm/msm/dp/dp_display.c

+4 −1
Original line number Diff line number Diff line 
/*

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

 * Copyright (c) 2017-2021, 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
@@ -780,6 +780,9 @@ static int dp_display_usbpd_attention_cb(struct device *dev) 
		return -ENODEV;

	}



	if (dp->usbpd->hpd_high && dp->usbpd->hpd_irq)

		drm_dp_cec_irq(dp->aux->drm_aux);



	if (dp->usbpd->hpd_irq && dp->usbpd->hpd_high &&

	    dp->power_on) {

		dp->link->process_request(dp->link);

drivers/gpu/drm/msm/dp/dp_link.c

+1 −3
Original line number Diff line number Diff line 
/*

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

 * Copyright (c) 2012-2018,2020-2021, 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
@@ -790,8 +790,6 @@ static int dp_link_parse_request(struct dp_link_private *link) 


	pr_debug("device service irq vector = 0x%x\n", data);



	drm_dp_cec_irq(link->aux->drm_aux);



	if (!(data & DP_AUTOMATED_TEST_REQUEST)) {

		pr_debug("no test requested\n");

		return 0;

drivers/hid/hid-core.c

+3 −3
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ EXPORT_SYMBOL_GPL(hid_register_report); 
 * Register a new field for this report.

 */



static struct hid_field *hid_register_field(struct hid_report *report, unsigned usages, unsigned values)

static struct hid_field *hid_register_field(struct hid_report *report, unsigned usages)

{

	struct hid_field *field;
@@ -102,7 +102,7 @@ static struct hid_field *hid_register_field(struct hid_report *report, unsigned 


	field = kzalloc((sizeof(struct hid_field) +

			 usages * sizeof(struct hid_usage) +

			 values * sizeof(unsigned)), GFP_KERNEL);

			 usages * sizeof(unsigned)), GFP_KERNEL);

	if (!field)

		return NULL;
@@ -281,7 +281,7 @@ static int hid_add_field(struct hid_parser *parser, unsigned report_type, unsign 
	usages = max_t(unsigned, parser->local.usage_index,

				 parser->global.report_count);



	field = hid_register_field(report, usages, parser->global.report_count);

	field = hid_register_field(report, usages);

	if (!field)

		return 0;

drivers/soc/qcom/msm_minidump.c

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

/* Copyright (c) 2017-2018,2021, 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
@@ -221,6 +221,7 @@ EXPORT_SYMBOL(msm_minidump_update_region); 
int msm_minidump_add_region(const struct md_region *entry)

{

	u32 entries;

	u32 toc_init;

	struct md_region *mdr;



	if (validate_region(entry))
@@ -239,6 +240,19 @@ int msm_minidump_add_region(const struct md_region *entry) 
		return -ENOMEM;

	}



	toc_init = 0;

	if (minidump_table.md_ss_toc &&

		(minidump_table.md_ss_toc->md_ss_enable_status ==

		MD_SS_ENABLED)) {

		toc_init = 1;

		if (minidump_table.md_ss_toc->ss_region_count >=

			MAX_NUM_ENTRIES) {

			spin_unlock(&mdt_lock);

			pr_err("Maximum regions in minidump table reached.\n");

			return -ENOMEM;

		}

	}



	mdr = &minidump_table.entry[entries];

	strlcpy(mdr->name, entry->name, sizeof(mdr->name));

	mdr->virt_addr = entry->virt_addr;
@@ -248,9 +262,7 @@ int msm_minidump_add_region(const struct md_region *entry) 


	minidump_table.num_regions = entries + 1;



	if (minidump_table.md_ss_toc &&

		(minidump_table.md_ss_toc->md_ss_enable_status ==

		MD_SS_ENABLED))

	if (toc_init)

		md_update_ss_toc(entry);

	else

		pendings++;