diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-07-02 11:05:57 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-07-02 11:05:57 +0200 |
| commit | 1510c57e93fdfdc8f5f6f6b2bbce44ac9a313172 (patch) | |
| tree | 059d0c10daff1f46c288c04502242770cda2f9ef /fs | |
| parent | 8c3daadecbff2674f56e057b6cb0788dff906aea (diff) | |
| parent | 5f03074ea98b64b55c133b35ee144fdc909e6d69 (diff) | |
| download | barebox-1510c57e93fdfdc8f5f6f6b2bbce44ac9a313172.tar.gz barebox-1510c57e93fdfdc8f5f6f6b2bbce44ac9a313172.tar.xz | |
Merge branch 'for-next/resource-size'
Conflicts:
drivers/base/resource.c
fs/fs.c
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/devfs.c | 2 | ||||
| -rw-r--r-- | fs/fs.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/devfs.c b/fs/devfs.c index 2549ea60a8..ea8b250a68 100644 --- a/fs/devfs.c +++ b/fs/devfs.c @@ -172,7 +172,7 @@ static int devfs_truncate(struct device_d *dev, FILE *f, ulong size) { if (f->dev->num_resources < 1) return -ENOSPC; - if (size > f->dev->resource[0].size) + if (size > resource_size(&f->dev->resource[0])) return -ENOSPC; return 0; } @@ -1282,7 +1282,7 @@ 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, dev->resource[0].size - offset); + size = min((loff_t)count, resource_size(&dev->resource[0]) - offset); memcpy_sz(buf, dev_get_mem_region(dev, 0) + offset, size, flags & O_RWSIZE_MASK); return size; } @@ -1297,7 +1297,7 @@ 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, dev->resource[0].size - offset); + size = min((loff_t)count, resource_size(&dev->resource[0]) - offset); memcpy_sz(dev_get_mem_region(dev, 0) + offset, buf, size, flags & O_RWSIZE_MASK); return size; } |