diff options
| author |   Ville Syrjala <syrjala@sci.fi> | 2011-05-04 20:54:27 -0700 |
|---|---|---|
| committer |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-05-05 08:49:38 -0700 |
| commit | 7388754e0399d341e6d02fc7394b3727cad57371 (patch) | |
| tree | ce88890327cbc0364840cfd46fb74bdadb3905e2 /drivers/input | |
| parent | Input: sh_keysc - only compile PM code if PM is enabled (diff) | |
| download | linux-dev-7388754e0399d341e6d02fc7394b3727cad57371.tar.xz linux-dev-7388754e0399d341e6d02fc7394b3727cad57371.zip | |
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>
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/misc/ati_remote2.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/input/misc/ati_remote2.c b/drivers/input/misc/ati_remote2.c index 9ccdb82d869a..1de58e8a1b71 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, |