diff options
| author | Alexander Aring <alex.aring@googlemail.com> | 2012-09-11 07:31:31 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-09-11 09:19:47 +0200 |
| commit | 05a68cca1f41d16c9d79c6903aa1f52328e2d1c9 (patch) | |
| tree | 0b81d75dac7d4a7c8399991370ac194a6212fe7e | |
| parent | a685c02ebfd1b345c2059f36336e8c5d89cf2a8c (diff) | |
| download | barebox-05a68cca1f41d16c9d79c6903aa1f52328e2d1c9.tar.gz barebox-05a68cca1f41d16c9d79c6903aa1f52328e2d1c9.tar.xz | |
fs: fs.c fix cast
Fix casting on min argument, to avoid warnings on 64bit build.
Signed-off-by: Alexander Aring <alex.aring@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | fs/fs.c | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -1525,7 +1525,9 @@ ssize_t mem_read(struct cdev *cdev, void *buf, size_t count, loff_t offset, ulon return -1; dev = cdev->dev; - size = min((loff_t)count, resource_size(&dev->resource[0]) - offset); + 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; } @@ -1540,7 +1542,9 @@ ssize_t mem_write(struct cdev *cdev, const void *buf, size_t count, loff_t offse return -1; dev = cdev->dev; - size = min((loff_t)count, resource_size(&dev->resource[0]) - offset); + 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; } |