From: 黄涛 <huangtao@rock-chips.com>
Date: Sat, 30 Jul 2011 15:09:34 +0000 (+0800)
Subject: Revert "w1: don't allow arbitrary users to remove w1 devices"
X-Git-Tag: firefly_0821_release~9852
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=12d1460f9dd2de4a0021f9d7b5761217b338c7fb;p=firefly-linux-kernel-4.4.55.git

Revert "w1: don't allow arbitrary users to remove w1 devices"

This reverts commit b08a883b6dce4b0f0cd52d8bee7505472301387c.
---

diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c
index db7b6198f152..acc7e3b7fe17 100644
--- a/drivers/w1/w1.c
+++ b/drivers/w1/w1.c
@@ -517,10 +517,10 @@ static W1_MASTER_ATTR_RO(max_slave_count, S_IRUGO);
 static W1_MASTER_ATTR_RO(attempts, S_IRUGO);
 static W1_MASTER_ATTR_RO(timeout, S_IRUGO);
 static W1_MASTER_ATTR_RO(pointer, S_IRUGO);
-static W1_MASTER_ATTR_RW(search, S_IRUGO | S_IWUSR | S_IWGRP);
-static W1_MASTER_ATTR_RW(pullup, S_IRUGO | S_IWUSR | S_IWGRP);
-static W1_MASTER_ATTR_RW(add, S_IRUGO | S_IWUSR | S_IWGRP);
-static W1_MASTER_ATTR_RW(remove, S_IRUGO | S_IWUSR | S_IWGRP);
+static W1_MASTER_ATTR_RW(search, S_IRUGO | S_IWUGO);
+static W1_MASTER_ATTR_RW(pullup, S_IRUGO | S_IWUGO);
+static W1_MASTER_ATTR_RW(add, S_IRUGO | S_IWUGO);
+static W1_MASTER_ATTR_RW(remove, S_IRUGO | S_IWUGO);
 
 static struct attribute *w1_master_default_attrs[] = {
 	&w1_master_attribute_name.attr,