diff options
| author | Mark Brown <broonie@linaro.org> | 2014-03-11 09:47:53 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-11 09:47:53 +0000 |
| commit | 943550a24c51bdd971f579200f286241548deaf7 (patch) | |
| tree | 4b275941890744cf4ea588ea59db7cd6558647b6 /drivers/video/adf/adf_fops32.c | |
| parent | 0356888ad14044efe98b16a731ba56d74b89269e (diff) | |
| parent | a3b71254e95dc167ddca600c0ca426e8ce2fad3f (diff) | |
Merge branch 'linaro-android-3.10-lsk' of git://git.linaro.org/people/jstultz/android into linux-linaro-lsk-androidlsk-android-14.03
Conflicts:
arch/arm64/include/asm/cmpxchg.h
drivers/cpufreq/cpufreq.c
include/net/tcp.h
net/ipv4/ping.c
net/ipv4/sysctl_net_ipv4.c
net/netfilter/xt_qtaguid.c
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; |