Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[pandora-kernel.git] / drivers / input / misc / ati_remote2.c

diff --git a/drivers/input/misc/ati_remote2.c b/drivers/input/misc/ati_remote2.c
index 9ccdb82..1de58e8 100644 (file)
--- a/drivers/input/misc/ati_remote2.c
+++ b/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);
 
-       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);
 
        usb_autopm_put_interface(ar2->intf[0]);
 
-       return count;
+       return r ? r : count;
 }
 
 static ssize_t ati_remote2_show_mode_mask(struct device *dev,