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.10 052/173] IB/qib: Fix txselect regression
    Date
    3.10-stable review patch.  If anyone has any objections, please let me know.

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

    From: Mike Marciniszyn <mike.marciniszyn@intel.com>

    commit 2fadd83184d58701f1116ca578465b5a75f9417c upstream.

    Commit 7fac33014f54("IB/qib: checkpatch fixes") was overzealous in
    removing a simple_strtoul for a parse routine, setup_txselect(). That
    routine is required to handle a multi-value string.

    Unwind that aspect of the fix.

    Signed-off-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
    Signed-off-by: Roland Dreier <roland@purestorage.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/infiniband/hw/qib/qib_iba7322.c | 11 +++++------
    1 file changed, 5 insertions(+), 6 deletions(-)

    --- a/drivers/infiniband/hw/qib/qib_iba7322.c
    +++ b/drivers/infiniband/hw/qib/qib_iba7322.c
    @@ -5853,21 +5853,20 @@ static int setup_txselect(const char *st
    {
    struct qib_devdata *dd;
    unsigned long val;
    - int ret;
    -
    + char *n;
    if (strlen(str) >= MAX_ATTEN_LEN) {
    pr_info("txselect_values string too long\n");
    return -ENOSPC;
    }
    - ret = kstrtoul(str, 0, &val);
    - if (ret || val >= (TXDDS_TABLE_SZ + TXDDS_EXTRA_SZ +
    + val = simple_strtoul(str, &n, 0);
    + if (n == str || val >= (TXDDS_TABLE_SZ + TXDDS_EXTRA_SZ +
    TXDDS_MFG_SZ)) {
    pr_info("txselect_values must start with a number < %d\n",
    TXDDS_TABLE_SZ + TXDDS_EXTRA_SZ + TXDDS_MFG_SZ);
    - return ret ? ret : -EINVAL;
    + return -EINVAL;
    }
    -
    strcpy(txselect_list, str);
    +
    list_for_each_entry(dd, &qib_dev_list, list)
    if (dd->deviceid == PCI_DEVICE_ID_QLOGIC_IB_7322)
    set_no_qsfp_atten(dd, 1);



    \
     
     \ /
      Last update: 2013-12-03 00:21    [W:3.255 / U:0.348 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site