9
0
Fork 0

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>
This commit is contained in:
Alexander Aring 2012-09-11 07:31:31 +02:00 committed by Sascha Hauer
parent a685c02ebf
commit 05a68cca1f
1 changed files with 6 additions and 2 deletions

View File

@ -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;
}