From: Ville Syrjala Date: Thu, 5 May 2011 03:54:27 +0000 (-0700) Subject: Input: ati_remote2 - return the error code from sysfs channel_mask store X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7388754e0399d341e6d02fc7394b3727cad57371;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git 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 Signed-off-by: Dmitry Torokhov --- diff --git a/drivers/input/misc/ati_remote2.c b/drivers/input/misc/ati_remote2.c index 9ccdb82d869..1de58e8a1b7 100644 --- 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,