Merge "spmi: regmap: enable userspace writes" (c19e5ec5) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/base/regmap/regmap-debugfs.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -274,7 +274,7 @@ static ssize_t regmap_map_read_file(struct file file, char __user user_buf,
		count, ppos);
		}

		#undef REGMAP_ALLOW_WRITE_DEBUGFS
		#define REGMAP_ALLOW_WRITE_DEBUGFS
		#ifdef REGMAP_ALLOW_WRITE_DEBUGFS
		/*
		* This can be dangerous especially when we have clients such as

+4 −13

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2012-2015, 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
		* only version 2 as published by the Free Software Foundation.
		*
		* This program is distributed in the hope that it will be useful,
		* but WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		* GNU General Public License for more details.
		*/
		// SPDX-License-Identifier: GPL-2.0
		/* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved. */

		#include <linux/kernel.h>
		#include <linux/errno.h>
		#include <linux/idr.h>
		@@ -70,7 +61,7 @@ int spmi_device_add(struct spmi_device *sdev)
		struct spmi_controller *ctrl = sdev->ctrl;
		int err;

		dev_set_name(&sdev->dev, "%d-%02x", ctrl->nr, sdev->usid);
		dev_set_name(&sdev->dev, "spmi%d-%02x", ctrl->nr, sdev->usid);

		err = device_add(&sdev->dev);
		if (err < 0) {