diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2010-06-29 15:56:36 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-07-05 15:07:13 +0200 |
| commit | 9ae9ef472ef45dbed603b61a5094790f711529d1 (patch) | |
| tree | a07f59ea5f8310f490b4b26a2e6acf630198256c /fs | |
| parent | 8196b9e2ccb8f75ef23123fd1cf3c02776b6ed19 (diff) | |
| download | barebox-9ae9ef472ef45dbed603b61a5094790f711529d1.tar.gz barebox-9ae9ef472ef45dbed603b61a5094790f711529d1.tar.xz | |
devfs: only check for ioctl function when needed
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/devfs.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/fs/devfs.c b/fs/devfs.c index 9ce9117672..7019c8d920 100644 --- a/fs/devfs.c +++ b/fs/devfs.c @@ -193,6 +193,8 @@ static int partition_ioctl(struct cdev *cdev, int request, void *buf) user->eccsize = 0; return 0; } + if (!cdev->ops->ioctl) + return -EINVAL; return cdev->ops->ioctl(cdev, request, buf); default: return -EINVAL; @@ -202,17 +204,14 @@ static int partition_ioctl(struct cdev *cdev, int request, void *buf) static int devfs_ioctl(struct device_d *_dev, FILE *f, int request, void *buf) { struct cdev *cdev = f->inode; - int ret = -EINVAL; + + if (cdev->flags & DEVFS_IS_PARTITION) + return partition_ioctl(cdev, request, buf); if (!cdev->ops->ioctl) - goto out; + return -EINVAL; - if (cdev->flags & DEVFS_IS_PARTITION) - ret = partition_ioctl(cdev, request, buf); - else - ret = cdev->ops->ioctl(cdev, request, buf); -out: - return ret; + return cdev->ops->ioctl(cdev, request, buf); } static int devfs_truncate(struct device_d *dev, FILE *f, ulong size) |