diff options
| author | Philippe Langlais <philippe.langlais@linaro.org> | 2011-04-06 09:39:29 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@stericsson.com> | 2011-09-19 15:14:47 +0200 |
| commit | 455d488a59f0fe7b1ac2bc033f8ee156c6c796b2 (patch) | |
| tree | 5a2bcca8a83a0447f49029549161dd211592b676 /drivers/char | |
| parent | 3284ed3f9f29222c3d559f64853c0f03df222012 (diff) | |
shrm: Fix compilation pb after 2.6.38 merge, change ioctl to unlocked_ioctl
Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/shrm_char.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/char/shrm_char.c b/drivers/char/shrm_char.c index 256add7cdb8..2890f152d2d 100644 --- a/drivers/char/shrm_char.c +++ b/drivers/char/shrm_char.c @@ -527,13 +527,12 @@ ssize_t isa_write(struct file *filp, const char __user *buf, * downlink message once the message is copied. Message is copied from offset * location returned by previous ioctl before calling this ioctl. */ -static int isa_ioctl(struct inode *inode, struct file *filp, - unsigned cmd, unsigned long arg) +static long isa_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) { - int err = 0; + long err = 0; struct isadev_context *isadev = filp->private_data; struct shrm_dev *shrm = isadev->dl_queue.shrm; - u32 m = iminor(inode); + u32 m = iminor(filp->f_path.dentry->d_inode); isadev = (struct isadev_context *)filp->private_data; @@ -734,7 +733,7 @@ const struct file_operations isa_fops = { .owner = THIS_MODULE, .open = isa_open, .release = isa_close, - .ioctl = isa_ioctl, + .unlocked_ioctl = isa_ioctl, .mmap = isa_mmap, .read = isa_read, .write = isa_write, |