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

bluetooth: vflash: fix warning: initialization from incompatible pointer type
---

diff --git a/drivers/bluetooth/vflash.c b/drivers/bluetooth/vflash.c
index 44070a74b352..e889e823f7cb 100755
--- a/drivers/bluetooth/vflash.c
+++ b/drivers/bluetooth/vflash.c
@@ -34,11 +34,10 @@ static struct miscdevice vflash_miscdev;
 extern char GetSNSectorInfo(char * pbuf);
 extern unsigned char wlan_mac_addr[6];
 
-static int vflash_ioctl(struct inode *inode, struct file *file,
+static long vflash_ioctl(struct file *file,
 					unsigned int cmd, unsigned long arg)
 {
 	void __user *argp = (void __user *)arg;
-    unsigned long n = 0;
     
     DBG("%s---cmd=0x%x---arg=0x%x\n", __FUNCTION__, cmd, arg);
 
@@ -49,7 +48,7 @@ static int vflash_ioctl(struct inode *inode, struct file *file,
     {
         case READ_BDADDR_FROM_FLASH:
         {   
-#if CONFIG_WIFI_MAC
+#ifdef CONFIG_WIFI_MAC
             unsigned char bd_addr[6] = {0};
             int i;