lkml.org 
[lkml]   [2015]   [Jan]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 007/176] can: peak_usb: fix memset() usage
    Date
    From: Stephane Grosjean <s.grosjean@peak-system.com>

    3.12-stable review patch. If anyone has any objections, please let me know.

    ===============

    commit dc50ddcd4c58a5a0226038307d6ef884bec9f8c2 upstream.

    This patchs fixes a misplaced call to memset() that fills the request
    buffer with 0. The problem was with sending PCAN_USBPRO_REQ_FCT
    requests, the content set by the caller was thus lost.

    With this patch, the memory area is zeroed only when requesting info
    from the device.

    Signed-off-by: Stephane Grosjean <s.grosjean@peak-system.com>
    Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    ---
    drivers/net/can/usb/peak_usb/pcan_usb_pro.c | 3 +--
    1 file changed, 1 insertion(+), 2 deletions(-)

    diff --git a/drivers/net/can/usb/peak_usb/pcan_usb_pro.c b/drivers/net/can/usb/peak_usb/pcan_usb_pro.c
    index 263dd921edc4..f7f796a2c50b 100644
    --- a/drivers/net/can/usb/peak_usb/pcan_usb_pro.c
    +++ b/drivers/net/can/usb/peak_usb/pcan_usb_pro.c
    @@ -333,8 +333,6 @@ static int pcan_usb_pro_send_req(struct peak_usb_device *dev, int req_id,
    if (!(dev->state & PCAN_USB_STATE_CONNECTED))
    return 0;

    - memset(req_addr, '\0', req_size);
    -
    req_type = USB_TYPE_VENDOR | USB_RECIP_OTHER;

    switch (req_id) {
    @@ -345,6 +343,7 @@ static int pcan_usb_pro_send_req(struct peak_usb_device *dev, int req_id,
    default:
    p = usb_rcvctrlpipe(dev->udev, 0);
    req_type |= USB_DIR_IN;
    + memset(req_addr, '\0', req_size);
    break;
    }

    --
    2.2.2


    \
     
     \ /
      Last update: 2015-01-29 12:01    [W:4.059 / U:0.148 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site