From 03fb2b4eb5ba2ce149f0a821c12fa1642388a734 Mon Sep 17 00:00:00 2001
From: Lan Tianyu <tianyu.lan@intel.com>
Date: Fri, 3 Aug 2012 16:30:35 +0800
Subject: [PATCH] --- yaml --- r: 325823 b: refs/heads/master c:
 7fc2cc320cd3e53954187d9cff8145f38ae4a015 h: refs/heads/master i:   325821:
 5b1eb026f5fd2df0590b7e8f6f79e9d57861a850   325819:
 a6f4bdb6f7b64bb3c248b942fdef5b5d251b1e27   325815:
 7ef2879c9eee38855f59408500d293c66f0d16e3   325807:
 fab473ac5c1e26043cd9b511df1b3783122fcb2d   325791:
 3270a8204e2d1709e819a11475f5f888ebe61d4a   325759:
 8d713cdf49df1f3dea62ee70c97ed5ebea5d61ef v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/usb/core/sysfs.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 201ef8186c74..7353d61436a2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 05f2b3912323b4130dbf6d5091601d9ca3aaf119
+refs/heads/master: 7fc2cc320cd3e53954187d9cff8145f38ae4a015
diff --git a/trunk/drivers/usb/core/sysfs.c b/trunk/drivers/usb/core/sysfs.c
index 682e8256b95d..d6c49d9ed4e0 100644
--- a/trunk/drivers/usb/core/sysfs.c
+++ b/trunk/drivers/usb/core/sysfs.c
@@ -204,12 +204,12 @@ set_avoid_reset_quirk(struct device *dev, struct device_attribute *attr,
 		const char *buf, size_t count)
 {
 	struct usb_device	*udev = to_usb_device(dev);
-	int			config;
+	int			val;
 
-	if (sscanf(buf, "%d", &config) != 1 || config < 0 || config > 1)
+	if (sscanf(buf, "%d", &val) != 1 || val < 0 || val > 1)
 		return -EINVAL;
 	usb_lock_device(udev);
-	if (config)
+	if (val)
 		udev->quirks |= USB_QUIRK_RESET_MORPHS;
 	else
 		udev->quirks &= ~USB_QUIRK_RESET_MORPHS;