diff options
author | Michal Nazarewicz <mina86@mina86.com> | 2011-04-14 05:55:43 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-29 20:24:36 -0400 |
commit | fd4477b09e13f60c7d9e497311ea6410a94aaae8 (patch) | |
tree | 01137169557a7433f3ddcbcb6b00d61c0d61f700 /drivers/usb/gadget | |
parent | 865835fa441fcabc65251f14280df3055fe82d0f (diff) |
usb: gadget: storage_common: use kstrto*() [bug fix]
This commit fixes an embarrassing bug in the "storage_common:
use kstrto*()" patch which caused fsg_store_ro() to return
zero instead of the length of the consumed buffer.
Signed-off-by: Michal Nazarewicz <mina86@mina86.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/gadget')
-rw-r--r-- | drivers/usb/gadget/storage_common.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/gadget/storage_common.c b/drivers/usb/gadget/storage_common.c index 109635a84888..1fa4f705b0b4 100644 --- a/drivers/usb/gadget/storage_common.c +++ b/drivers/usb/gadget/storage_common.c | |||
@@ -708,7 +708,7 @@ static ssize_t fsg_show_file(struct device *dev, struct device_attribute *attr, | |||
708 | static ssize_t fsg_store_ro(struct device *dev, struct device_attribute *attr, | 708 | static ssize_t fsg_store_ro(struct device *dev, struct device_attribute *attr, |
709 | const char *buf, size_t count) | 709 | const char *buf, size_t count) |
710 | { | 710 | { |
711 | ssize_t rc = count; | 711 | ssize_t rc; |
712 | struct fsg_lun *curlun = fsg_lun_from_dev(dev); | 712 | struct fsg_lun *curlun = fsg_lun_from_dev(dev); |
713 | struct rw_semaphore *filesem = dev_get_drvdata(dev); | 713 | struct rw_semaphore *filesem = dev_get_drvdata(dev); |
714 | unsigned ro; | 714 | unsigned ro; |
@@ -729,6 +729,7 @@ static ssize_t fsg_store_ro(struct device *dev, struct device_attribute *attr, | |||
729 | curlun->ro = ro; | 729 | curlun->ro = ro; |
730 | curlun->initially_ro = ro; | 730 | curlun->initially_ro = ro; |
731 | LDBG(curlun, "read-only status set to %d\n", curlun->ro); | 731 | LDBG(curlun, "read-only status set to %d\n", curlun->ro); |
732 | rc = count; | ||
732 | } | 733 | } |
733 | up_read(filesem); | 734 | up_read(filesem); |
734 | return rc; | 735 | return rc; |