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

Commit 704c9152 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "spmi: regmap: enable userspace writes" into msm-4.8

parents db8222b9 2ff2dafb

drivers/base/regmap/regmap-debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -269,7 +269,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

drivers/spmi/spmi.c

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

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

 * Copyright (c) 2012-2016, 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
@@ -70,7 +70,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) {