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

Commit 59ac20c7 authored by Jayant-Deshmukh's avatar Jayant-Deshmukh
Browse files

Merge https://github.com/LineageOS/android_kernel_qcom_sm8150 into lineage-20

parents 12557898 7434f7b7

drivers/char/diag/diagmem.c

+1 −1
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ void *diagmem_alloc(struct diagchar_dev *driver, int size, int pool_type) 
			break;

		}

		if (size == 0 || size > mempool->itemsize ||

			size > (int)mempool->pool->pool_data) {

			size > (size_t)mempool->pool->pool_data) {

			pr_err_ratelimited("diag: cannot alloc from mempool %s, invalid size: %d\n",

					   mempool->name, size);

			break;

drivers/gpu/drm/msm/msm_gem.c

+0 −1
Original line number Diff line number Diff line
@@ -1300,7 +1300,6 @@ struct drm_gem_object *msm_gem_import(struct drm_device *dev, 
	mutex_unlock(&msm_obj->lock);

	return obj;



fail:

	drm_gem_object_unreference_unlocked(obj);

	return ERR_PTR(ret);

}

drivers/hwtracing/coresight/coresight-tmc.c

+2 −2
Original line number Diff line number Diff line
@@ -430,7 +430,7 @@ static ssize_t out_mode_store(struct device *dev, 


	if (strlen(buf) >= 10)

		return -EINVAL;

	if (sscanf(buf, "%10s", str) != 1)

	if (sscanf(buf, "%s", str) != 1)

		return -EINVAL;

	ret = tmc_etr_switch_mode(drvdata, str);

	return ret ? ret : size;
@@ -455,7 +455,7 @@ static ssize_t pcie_path_store(struct device *dev, 


	if (strlen(buf) >= 10)

		return -EINVAL;

	if (sscanf(buf, "%10s", str) != 1)

	if (sscanf(buf, "%s", str) != 1)

		return -EINVAL;



	mutex_lock(&drvdata->mem_lock);

drivers/input/touchscreen/synaptics_dsx/synaptics_dsx_core.c

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 *

 * Copyright (C) 2012-2016 Synaptics Incorporated. All rights reserved.

 *

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

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

 * Copyright (C) 2012 Alexandra Chin <alexandra.chin@tw.synaptics.com>

 * Copyright (C) 2012 Scott Lin <scott.lin@tw.synaptics.com>

 *
@@ -3313,7 +3313,7 @@ static int synaptics_rmi4_gpio_setup(int gpio, bool config, int dir, int state) 
	unsigned char buf[16];



	if (config) {

		snprintf(buf, PAGE_SIZE, "dsx_gpio_%u\n", gpio);

		snprintf(buf, sizeof(buf), "dsx_gpio_%u\n", gpio);



		retval = gpio_request(gpio, buf);

		if (retval) {

drivers/md/dm-bow.c

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 
#include <linux/module.h>



#define DM_MSG_PREFIX "bow"

#define SECTOR_SIZE 512



struct log_entry {

	u64 source;