2 files changed, 23 insertions, 14 deletions

diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
index 3c76f6f9c835..a0671e57dd8b 100644
--- a/drivers/input/mouse/psmouse-base.c
+++ b/drivers/input/mouse/psmouse-base.c
@@ -1401,25 +1401,29 @@ ssize_t psmouse_attr_set_helper(struct device *dev, struct device_attribute *dev
 
         psmouse = serio_get_drvdata(serio);
 
-        if (psmouse->state == PSMOUSE_IGNORE) {
-                retval = -ENODEV;
-                goto out_unlock;
-        }
+        if (attr->protect) {
+                if (psmouse->state == PSMOUSE_IGNORE) {
+                        retval = -ENODEV;
+                        goto out_unlock;
+                }
 
-        if (serio->parent && serio->id.type == SERIO_PS_PSTHRU) {
-                parent = serio_get_drvdata(serio->parent);
-                psmouse_deactivate(parent);
-        }
+                if (serio->parent && serio->id.type == SERIO_PS_PSTHRU) {
+                        parent = serio_get_drvdata(serio->parent);
+                        psmouse_deactivate(parent);
+                }
 
-        psmouse_deactivate(psmouse);
+                psmouse_deactivate(psmouse);
+        }
 
         retval = attr->set(psmouse, attr->data, buf, count);
 
-        if (retval != -ENODEV)
-                psmouse_activate(psmouse);
+        if (attr->protect) {
+                if (retval != -ENODEV)
+                        psmouse_activate(psmouse);
 
-        if (parent)
-                psmouse_activate(parent);
+                if (parent)
+                        psmouse_activate(parent);
+        }
 
  out_unlock:
         mutex_unlock(&psmouse_mutex);
diff --git a/drivers/input/mouse/psmouse.h b/drivers/input/mouse/psmouse.h
index 48e0112fb264..0f13c1b499ab 100644
--- a/drivers/input/mouse/psmouse.h
+++ b/drivers/input/mouse/psmouse.h
@@ -106,6 +106,7 @@ struct psmouse_attribute {
         ssize_t (*show)(struct psmouse *psmouse, void *data, char *buf);
         ssize_t (*set)(struct psmouse *psmouse, void *data,
                         const char *buf, size_t count);
+        int protect;
 };
 #define to_psmouse_attr(a)      container_of((a), struct psmouse_attribute, dattr)
 
@@ -114,7 +115,7 @@ ssize_t psmouse_attr_show_helper(struct device *dev, struct device_attribute *at
 ssize_t psmouse_attr_set_helper(struct device *dev, struct device_attribute *attr,
                                 const char *buf, size_t count);
 
-#define PSMOUSE_DEFINE_ATTR(_name, _mode, _data, _show, _set)                   \
+#define __PSMOUSE_DEFINE_ATTR(_name, _mode, _data, _show, _set, _protect)       \
 static ssize_t _show(struct psmouse *, void *data, char *);                     \
 static ssize_t _set(struct psmouse *, void *data, const char *, size_t);        \
 static struct psmouse_attribute psmouse_attr_##_name = {                        \
@@ -129,6 +130,10 @@ static struct psmouse_attribute psmouse_attr_##_name = {			\
         .data   = _data,                                                        \
         .show   = _show,                                                        \
         .set    = _set,                                                         \
+        .protect = _protect,                                                    \
 }
 
+#define PSMOUSE_DEFINE_ATTR(_name, _mode, _data, _show, _set)   \
+                __PSMOUSE_DEFINE_ATTR(_name, _mode, _data, _show, _set, 1)
+
 #endif /* _PSMOUSE_H */