lkml.org 
[lkml]   [2010]   [Jul]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCHv4 1/2] usb: gadget: storage: strict coversion of 'ro' parameter
    Date
    Bring a strict way to get the 'ro' parameter from the user.

    The patch followed by this one adds another boolean parameter. To be consistent
    Michał Nazarewicz proposed to use simple_strtol() in both cases (correspondend
    discussion in LKML [1]). Due to simple_strtol() doesn't return error in a good
    way and we have a boolean parameter the strict_strtoul() is used.

    [1] http://lkml.org/lkml/2010/7/14/169

    Signed-off-by: Andy Shevchenko <ext-andriy.shevchenko@nokia.com>
    Cc: Alan Stern <stern@rowland.harvard.edu>
    Cc: David Brownell <dbrownell@users.sourceforge.net>
    Cc: Greg Kroah-Hartman <gregkh@suse.de>
    Cc: linux-usb@vger.kernel.org
    ---
    drivers/usb/gadget/storage_common.c | 8 ++++----
    1 files changed, 4 insertions(+), 4 deletions(-)

    diff --git a/drivers/usb/gadget/storage_common.c b/drivers/usb/gadget/storage_common.c
    index 04c462f..7123929 100644
    --- a/drivers/usb/gadget/storage_common.c
    +++ b/drivers/usb/gadget/storage_common.c
    @@ -723,9 +723,9 @@ static ssize_t fsg_store_ro(struct device *dev, struct device_attribute *attr,
    ssize_t rc = count;
    struct fsg_lun *curlun = fsg_lun_from_dev(dev);
    struct rw_semaphore *filesem = dev_get_drvdata(dev);
    - int i;
    + unsigned long ro;

    - if (sscanf(buf, "%d", &i) != 1)
    + if (strict_strtoul(buf, 2, &ro))
    return -EINVAL;

    /* Allow the write-enable status to change only while the backing file
    @@ -735,8 +735,8 @@ static ssize_t fsg_store_ro(struct device *dev, struct device_attribute *attr,
    LDBG(curlun, "read-only status change prevented\n");
    rc = -EBUSY;
    } else {
    - curlun->ro = !!i;
    - curlun->initially_ro = !!i;
    + curlun->ro = ro;
    + curlun->initially_ro = ro;
    LDBG(curlun, "read-only status set to %d\n", curlun->ro);
    }
    up_read(filesem);
    --
    1.6.3.3
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2010-07-22 10:55    [W:0.023 / U:31.332 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site