1 files changed, 24 insertions, 22 deletions

diff --git a/fs/devfs-core.c b/fs/devfs-core.c
index d703c06a0d..2b93a951f2 100644
--- a/fs/devfs-core.c
+++ b/fs/devfs-core.c
@@ -511,12 +511,22 @@ void cdev_remove_loop(struct cdev *cdev)
 	free(cdev);
 }
 
-static void memcpy_sz(void *dst, const void *src, size_t count, int rwsize)
+static ssize_t mem_copy(struct device_d *dev, void *dst, const void *src,
+			resource_size_t count, resource_size_t offset,
+			unsigned long flags)
 {
+	ssize_t size;
+	int rwsize = flags & O_RWSIZE_MASK;
+
+	if (!dev || dev->num_resources < 1)
+		return -1;
+
+	count = size = min(count, resource_size(&dev->resource[0]) - offset);
+
 	/* no rwsize specification given. Do whatever memcpy likes best */
 	if (!rwsize) {
 		memcpy(dst, src, count);
-		return;
+		goto out;
 	}
 
 	rwsize = rwsize >> O_RWSIZE_SHIFT;
@@ -542,40 +552,32 @@ static void memcpy_sz(void *dst, const void *src, size_t count, int rwsize)
 		src += rwsize;
 		count -= rwsize;
 	}
+out:
+	return size;
 }
 
 ssize_t mem_read(struct cdev *cdev, void *buf, size_t count, loff_t offset,
 		 unsigned long flags)
 {
-	unsigned long size;
-	struct device_d *dev;
+	struct device_d *dev = cdev->dev;
 
-	if (!cdev->dev || cdev->dev->num_resources < 1)
+	if (!dev)
 		return -1;
-	dev = cdev->dev;
 
-	size = min((resource_size_t)count,
-			resource_size(&dev->resource[0]) -
-			(resource_size_t)offset);
-	memcpy_sz(buf, dev_get_mem_region(dev, 0) + offset, size, flags & O_RWSIZE_MASK);
-	return size;
+	return mem_copy(dev, buf, dev_get_mem_region(dev, 0) + offset,
+			count, offset, flags);
 }
 EXPORT_SYMBOL(mem_read);
 
-ssize_t mem_write(struct cdev *cdev, const void *buf, size_t count, loff_t offset,
-		  unsigned long flags)
+ssize_t mem_write(struct cdev *cdev, const void *buf, size_t count,
+		  loff_t offset, unsigned long flags)
 {
-	unsigned long size;
-	struct device_d *dev;
+	struct device_d *dev = cdev->dev;
 
-	if (!cdev->dev || cdev->dev->num_resources < 1)
+	if (!dev)
 		return -1;
-	dev = cdev->dev;
 
-	size = min((resource_size_t)count,
-			resource_size(&dev->resource[0]) -
-			(resource_size_t)offset);
-	memcpy_sz(dev_get_mem_region(dev, 0) + offset, buf, size, flags & O_RWSIZE_MASK);
-	return size;
+	return mem_copy(dev, dev_get_mem_region(dev, 0) + offset, buf,
+			count, offset, flags);
 }
 EXPORT_SYMBOL(mem_write);