Merge tag 'iio-fixes-for-4.6b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23...

[deliverable/linux.git] / drivers / firewire / core-cdev.c

diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c
index 36a7c2d89a010e7a567224c89a01a2ebe0c8fd20..aee149bdf4c0339169d939eed797ef9e6ab521bf 100644 (file)
--- a/drivers/firewire/core-cdev.c
+++ b/drivers/firewire/core-cdev.c
@@ -221,7 +221,7 @@ struct inbound_phy_packet_event {
 #ifdef CONFIG_COMPAT
 static void __user *u64_to_uptr(u64 value)
 {
-       if (is_compat_task())
+       if (in_compat_syscall())
                return compat_ptr(value);
        else
                return (void __user *)(unsigned long)value;
@@ -229,7 +229,7 @@ static void __user *u64_to_uptr(u64 value)
 
 static u64 uptr_to_u64(void __user *ptr)
 {
-       if (is_compat_task())
+       if (in_compat_syscall())
                return ptr_to_compat(ptr);
        else
                return (u64)(unsigned long)ptr;