lkml.org 
[lkml]   [2013]   [Dec]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 207/212] HID: roccat: add new device return value
    Date
    3.12-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Stefan Achatz <erazor_de@users.sourceforge.net>

    commit 14fc4290df2fb94a28f39dab9ed32feaa5527bef upstream.

    Ryos uses a new return value for critical errors, others have been
    confirmed.

    Signed-off-by: Stefan Achatz <erazor_de@users.sourceforge.net>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/hid/hid-roccat-common.c | 12 ++++++------
    1 file changed, 6 insertions(+), 6 deletions(-)

    --- a/drivers/hid/hid-roccat-common.c
    +++ b/drivers/hid/hid-roccat-common.c
    @@ -65,10 +65,11 @@ int roccat_common2_send(struct usb_devic
    EXPORT_SYMBOL_GPL(roccat_common2_send);

    enum roccat_common2_control_states {
    - ROCCAT_COMMON_CONTROL_STATUS_OVERLOAD = 0,
    + ROCCAT_COMMON_CONTROL_STATUS_CRITICAL = 0,
    ROCCAT_COMMON_CONTROL_STATUS_OK = 1,
    ROCCAT_COMMON_CONTROL_STATUS_INVALID = 2,
    - ROCCAT_COMMON_CONTROL_STATUS_WAIT = 3,
    + ROCCAT_COMMON_CONTROL_STATUS_BUSY = 3,
    + ROCCAT_COMMON_CONTROL_STATUS_CRITICAL_NEW = 4,
    };

    static int roccat_common2_receive_control_status(struct usb_device *usb_dev)
    @@ -88,13 +89,12 @@ static int roccat_common2_receive_contro
    switch (control.value) {
    case ROCCAT_COMMON_CONTROL_STATUS_OK:
    return 0;
    - case ROCCAT_COMMON_CONTROL_STATUS_WAIT:
    + case ROCCAT_COMMON_CONTROL_STATUS_BUSY:
    msleep(500);
    continue;
    case ROCCAT_COMMON_CONTROL_STATUS_INVALID:
    -
    - case ROCCAT_COMMON_CONTROL_STATUS_OVERLOAD:
    - /* seems to be critical - replug necessary */
    + case ROCCAT_COMMON_CONTROL_STATUS_CRITICAL:
    + case ROCCAT_COMMON_CONTROL_STATUS_CRITICAL_NEW:
    return -EINVAL;
    default:
    dev_err(&usb_dev->dev,



    \
     
     \ /
      Last update: 2013-12-02 23:41    [W:2.282 / U:0.132 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site