From 5400acb4853369859d4e36274e26684752f8a09f Mon Sep 17 00:00:00 2001
From: =?utf8?q?=E9=BB=84=E6=B6=9B?= <huangtao@rock-chips.com>
Date: Mon, 7 Nov 2011 14:36:09 +0800
Subject: [PATCH] bluetooth: vflash: fix warning: initialization from
incompatible pointer type
---
drivers/bluetooth/vflash.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
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;
--
2.34.1