summaryrefslogtreecommitdiffstats
path: root/fs/devfs.c
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2011-10-19 09:27:47 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2012-06-30 16:53:24 +0200
commitbe573120fe20e2735e8ec8db26c2f3feeec11bf4 (patch)
treefff4e24bdfbcef8de8216c9082d549e8bf8b02d8 /fs/devfs.c
parent849ce2df7ab7ea1dabbdf04f1944f378075314cf (diff)
downloadbarebox-be573120fe20e2735e8ec8db26c2f3feeec11bf4.tar.gz
barebox-be573120fe20e2735e8ec8db26c2f3feeec11bf4.tar.xz
make cdev 64bit capable
Next step to 64bit support: Make cdev size a 64bit type. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'fs/devfs.c')
-rw-r--r--fs/devfs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/devfs.c b/fs/devfs.c
index 863f4ec33e..5aace362e2 100644
--- a/fs/devfs.c
+++ b/fs/devfs.c
@@ -55,7 +55,7 @@ static int devfs_write(struct device_d *_dev, FILE *f, const void *buf, size_t s
static loff_t devfs_lseek(struct device_d *_dev, FILE *f, loff_t pos)
{
struct cdev *cdev = f->inode;
- off_t ret = -1;
+ loff_t ret = -1;
if (cdev->ops->lseek)
ret = cdev->ops->lseek(cdev, pos + cdev->offset);
@@ -100,7 +100,7 @@ static int devfs_memmap(struct device_d *_dev, FILE *f, void **map, int flags)
ret = cdev->ops->memmap(cdev, map, flags);
if (!ret)
- *map = (void *)((unsigned long)*map + cdev->offset);
+ *map = (void *)((unsigned long)*map + (unsigned long)cdev->offset);
return ret;
}