瀏覽代碼

Input: ati_remote2 - return the error code from sysfs channel_mask store

If the channel_mask setup fails when configuring it through sysfs,
return the error code to the caller instead of claiming success.

Signed-off-by: Ville Syrjala <syrjala@sci.fi>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Ville Syrjala 14 年之前
父節點
當前提交
7388754e03
共有 1 個文件被更改,包括 6 次插入3 次删除
  1. 6 3
      drivers/input/misc/ati_remote2.c

+ 6 - 3
drivers/input/misc/ati_remote2.c

@@ -737,14 +737,17 @@ static ssize_t ati_remote2_store_channel_mask(struct device *dev,
 
 
 	mutex_lock(&ati_remote2_mutex);
 	mutex_lock(&ati_remote2_mutex);
 
 
-	if (mask != ar2->channel_mask && !ati_remote2_setup(ar2, mask))
-		ar2->channel_mask = mask;
+	if (mask != ar2->channel_mask) {
+		r = ati_remote2_setup(ar2, mask);
+		if (!r)
+			ar2->channel_mask = mask;
+	}
 
 
 	mutex_unlock(&ati_remote2_mutex);
 	mutex_unlock(&ati_remote2_mutex);
 
 
 	usb_autopm_put_interface(ar2->intf[0]);
 	usb_autopm_put_interface(ar2->intf[0]);
 
 
-	return count;
+	return r ? r : count;
 }
 }
 
 
 static ssize_t ati_remote2_show_mode_mask(struct device *dev,
 static ssize_t ati_remote2_show_mode_mask(struct device *dev,