X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fusb%2Fmisc%2Fauerswald.c;h=e3c4226cef278e32eb5a5147e6ce48130af5a751;hb=5e3b93f248c98873cc843e83092bb8da92ac85a2;hp=310c5a96c6f536541367041716b0cb7e72637649;hpb=a91482bdcc2e0f6035702e46f1b99043a0893346;p=linux-2.6.git diff --git a/drivers/usb/misc/auerswald.c b/drivers/usb/misc/auerswald.c index 310c5a96c..e3c4226ce 100644 --- a/drivers/usb/misc/auerswald.c +++ b/drivers/usb/misc/auerswald.c @@ -2,7 +2,7 @@ /* * auerswald.c -- Auerswald PBX/System Telephone usb driver. * - * Copyright (C) 2001 Wolfgang Mües (wolfgang@iksw-muees.de) + * Copyright (C) 2001 Wolfgang Mües (wolfgang@iksw-muees.de) * * Very much code of this driver is borrowed from dabusb.c (Deti Fliegl) * and from the USB Skeleton driver (Greg Kroah-Hartman). Thank you. @@ -50,7 +50,7 @@ do { \ /*-------------------------------------------------------------------*/ /* Version Information */ #define DRIVER_VERSION "0.9.11" -#define DRIVER_AUTHOR "Wolfgang Mües " +#define DRIVER_AUTHOR "Wolfgang Mües " #define DRIVER_DESC "Auerswald PBX/System Telephone usb driver" /*-------------------------------------------------------------------*/ @@ -699,7 +699,7 @@ static int auerchain_control_msg (pauerchain_t acp, struct usb_device *dev, unsi dr->wLength = cpu_to_le16 (size); usb_fill_control_urb (urb, dev, pipe, (unsigned char*)dr, data, size, /* build urb */ - auerchain_blocking_completion, NULL); + auerchain_blocking_completion,0); ret = auerchain_start_wait_urb (acp, urb, timeout, &length); usb_free_urb (urb); @@ -1435,7 +1435,7 @@ static int auerchar_open (struct inode *inode, struct file *file) /* file IO stuff */ file->f_pos = 0; file->private_data = ccp; - return nonseekable_open(inode, file); + return 0; /* Error exit */ ofail: up (&cp->mutex);