From 91b710f639de243c4a5adb723e1ed98258c29437 Mon Sep 17 00:00:00 2001 From: Ville Syrjala Date: Wed, 4 May 2011 20:54:27 -0700 Subject: [PATCH] --- yaml --- r: 250504 b: refs/heads/master c: 7388754e0399d341e6d02fc7394b3727cad57371 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/input/misc/ati_remote2.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 9031be32064d..8164d44a5d38 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9cc7c80b57c66d08e67f297169783d1f07288066 +refs/heads/master: 7388754e0399d341e6d02fc7394b3727cad57371 diff --git a/trunk/drivers/input/misc/ati_remote2.c b/trunk/drivers/input/misc/ati_remote2.c index 9ccdb82d869a..1de58e8a1b71 100644 --- a/trunk/drivers/input/misc/ati_remote2.c +++ b/trunk/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,