diff options
author | Arnd Bergmann <arnd@arndb.de> | 2010-09-30 10:24:08 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-05 08:50:14 -0700 |
commit | 4fea0749b19a1df25482453b45d2a3d69c1670dc (patch) | |
tree | 62a297bb5ca285b6190f5c5efa0cb7d5c7d546c6 | |
parent | d16044cf8ce0ff6384cd80eb0abaa2ba57b19a5e (diff) |
staging/ft1000-usb: fix unlocked_ioctl prototype
unlocked_ioctl has a "long" return type.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c b/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c index 89d9a584879..44b037c2033 100644 --- a/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c +++ b/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c @@ -51,7 +51,7 @@ extern void CardSendCommand(struct ft1000_device *ft1000dev, unsigned short *pte static int ft1000_ChOpen (struct inode *Inode, struct file *File); static unsigned int ft1000_ChPoll(struct file *file, poll_table *wait); -static int ft1000_ChIoctl(struct file *File, unsigned int Command, +static long ft1000_ChIoctl(struct file *File, unsigned int Command, unsigned long Argument); static int ft1000_ChRelease (struct inode *Inode, struct file *File); @@ -536,7 +536,7 @@ static unsigned int ft1000_ChPoll(struct file *file, poll_table *wait) // Notes: // //--------------------------------------------------------------------------- -static int ft1000_ChIoctl (struct file *File, unsigned int Command, +static long ft1000_ChIoctl (struct file *File, unsigned int Command, unsigned long Argument) { struct net_device *dev; |