Merge branch 'android-4.4'

[firefly-linux-kernel-4.4.55.git] / drivers / staging / android / ion / compat_ion.c

diff --git a/drivers/staging/android/ion/compat_ion.c b/drivers/staging/android/ion/compat_ion.c
index a5e8c408fd7842e3e7e6791ac3194d71280c473c..a402fdaf54ca37417e5282d1bb89008190b9a73a 100644 (file)
--- a/drivers/staging/android/ion/compat_ion.c
+++ b/drivers/staging/android/ion/compat_ion.c
@@ -1,5 +1,5 @@
 /*
- * drivers/gpu/ion/compat_ion.c
+ * drivers/staging/android/ion/compat_ion.c
  *
  * Copyright (C) 2013 Google, Inc.
  *
@@ -125,7 +125,7 @@ long compat_ion_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 {
        long ret;
 
-       if (!filp->f_op || !filp->f_op->unlocked_ioctl)
+       if (!filp->f_op->unlocked_ioctl)
                return -ENOTTY;
 
        switch (cmd) {