From 3cbf148d8f41d2231e641d38416563875166804c Mon Sep 17 00:00:00 2001 From: Michal Nazarewicz Date: Thu, 14 Apr 2011 11:55:43 +0200 Subject: [PATCH] --- yaml --- r: 248761 b: refs/heads/master c: fd4477b09e13f60c7d9e497311ea6410a94aaae8 h: refs/heads/master i: 248759: 60e587019f82c1e64a99c68450b00f4d43d7d6ae v: v3 --- [refs] | 2 +- trunk/drivers/usb/gadget/storage_common.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 791516ed096c..47d64fec19f7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 865835fa441fcabc65251f14280df3055fe82d0f +refs/heads/master: fd4477b09e13f60c7d9e497311ea6410a94aaae8 diff --git a/trunk/drivers/usb/gadget/storage_common.c b/trunk/drivers/usb/gadget/storage_common.c index 109635a84888..1fa4f705b0b4 100644 --- a/trunk/drivers/usb/gadget/storage_common.c +++ b/trunk/drivers/usb/gadget/storage_common.c @@ -708,7 +708,7 @@ static ssize_t fsg_show_file(struct device *dev, struct device_attribute *attr, static ssize_t fsg_store_ro(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { - ssize_t rc = count; + ssize_t rc; struct fsg_lun *curlun = fsg_lun_from_dev(dev); struct rw_semaphore *filesem = dev_get_drvdata(dev); unsigned ro; @@ -729,6 +729,7 @@ static ssize_t fsg_store_ro(struct device *dev, struct device_attribute *attr, curlun->ro = ro; curlun->initially_ro = ro; LDBG(curlun, "read-only status set to %d\n", curlun->ro); + rc = count; } up_read(filesem); return rc;