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/devfs.c | |
| 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/devfs.c')
| -rw-r--r-- | fs/devfs.c | 2 |
1 files changed, 1 insertions, 1 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; } |