From: 黄涛 <huangtao@rock-chips.com>
Date: Mon, 7 Nov 2011 06:49:37 +0000 (+0800)
Subject: input: gsensor: mma8452: fix warning: initialization from incompatible pointer type
X-Git-Tag: firefly_0821_release~9754
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7f73a1a8cbd847a9ee6fac50a9201da8c0708c83;p=firefly-linux-kernel-4.4.55.git

input: gsensor: mma8452: fix warning: initialization from incompatible pointer type
---

diff --git a/drivers/input/gsensor/mma8452.c b/drivers/input/gsensor/mma8452.c
index fe4775d28152..079cc0f504ae 100755
--- a/drivers/input/gsensor/mma8452.c
+++ b/drivers/input/gsensor/mma8452.c
@@ -457,9 +457,7 @@ static int mma8452_release(struct inode *inode, struct file *file)
 	return 0;
 }
 
-//static int mma8452_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
-//	   unsigned long arg)
-static int mma8452_ioctl( struct file *file, unsigned int cmd,unsigned long arg)
+static long mma8452_ioctl( struct file *file, unsigned int cmd,unsigned long arg)
 {
 
 	void __user *argp = (void __user *)arg;