diff options
| author | John Stultz <john.stultz@linaro.org> | 2014-03-10 11:35:09 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2014-03-10 11:35:09 -0700 |
| commit | a3b71254e95dc167ddca600c0ca426e8ce2fad3f (patch) | |
| tree | 4bd8658f44a8eb46c52407ee57aea72ac02c6ab8 /drivers/video/adf/adf_fops32.c | |
| parent | 7fc52650e4f815c1f382af3c51fbd569ebade2b2 (diff) | |
| parent | 4a7ff82758858f77328574519f144e554513e6ba (diff) | |
Merge branch 'linaro-fixes/android-3.10' into linaro-android-3.10-lsk
Diffstat (limited to 'drivers/video/adf/adf_fops32.c')
| -rw-r--r-- | drivers/video/adf/adf_fops32.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/adf/adf_fops32.c b/drivers/video/adf/adf_fops32.c index 60a47cf5a781..d299a8161491 100644 --- a/drivers/video/adf/adf_fops32.c +++ b/drivers/video/adf/adf_fops32.c @@ -81,7 +81,7 @@ long adf_compat_get_device_data(struct file *file, &data->custom_data)) return -EFAULT; - ret = adf_file_ioctl(file, ADF_GET_DEVICE_DATA32, (unsigned long)data); + ret = adf_file_ioctl(file, ADF_GET_DEVICE_DATA, (unsigned long)data); if (ret < 0) return ret; @@ -122,7 +122,7 @@ long adf_compat_get_interface_data(struct file *file, &data->custom_data)) return -EFAULT; - ret = adf_file_ioctl(file, ADF_GET_DEVICE_DATA32, (unsigned long)data); + ret = adf_file_ioctl(file, ADF_GET_INTERFACE_DATA, (unsigned long)data); if (ret < 0) return ret; |