Skip to content

Commit

Permalink
Input: ati_remote2 - return the error code from sysfs channel_mask store
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Ville Syrjala authored and Dmitry Torokhov committed May 5, 2011
1 parent 9cc7c80 commit 7388754
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions drivers/input/misc/ati_remote2.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 7388754

Please sign in to comment.