summaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/keyspan.c
diff options
context:
space:
mode:
authorRene Buergel <rene.buergel@sohard.de>2012-09-13 22:14:38 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-09-14 06:59:51 +0200
commit99495c7061892f0312c0119725b550bb221634ce (patch)
treecde4743b6d5461d666f5158080a24dba057abfe6 /drivers/usb/serial/keyspan.c
parentUSB: omninet: fix potential tty NULL dereference (diff)
downloadlinux-99495c7061892f0312c0119725b550bb221634ce.tar.xz
linux-99495c7061892f0312c0119725b550bb221634ce.zip
USB: ezusb: remove dependancy on usb_serial
This patch removes the dependency on the usb_serial interface and names some magic constants Signed-off-by: René Bürgel <rene.buergel@sohard.de> -- Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/serial/keyspan.c')
-rw-r--r--drivers/usb/serial/keyspan.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/serial/keyspan.c b/drivers/usb/serial/keyspan.c
index af0b70eaf032..f0d4f3fcf4f7 100644
--- a/drivers/usb/serial/keyspan.c
+++ b/drivers/usb/serial/keyspan.c
@@ -1241,12 +1241,12 @@ static int keyspan_fake_startup(struct usb_serial *serial)
dbg("Uploading Keyspan %s firmware.", fw_name);
/* download the firmware image */
- response = ezusb_set_reset(serial, 1);
+ response = ezusb_set_reset(serial->dev, 1);
record = (const struct ihex_binrec *)fw->data;
while (record) {
- response = ezusb_writememory(serial, be32_to_cpu(record->addr),
+ response = ezusb_writememory(serial->dev, be32_to_cpu(record->addr),
(unsigned char *)record->data,
be16_to_cpu(record->len), 0xa0);
if (response < 0) {
@@ -1260,7 +1260,7 @@ static int keyspan_fake_startup(struct usb_serial *serial)
release_firmware(fw);
/* bring device out of reset. Renumeration will occur in a
moment and the new device will bind to the real driver */
- response = ezusb_set_reset(serial, 0);
+ response = ezusb_set_reset(serial->dev, 0);
/* we don't want this device to have a driver assigned to it. */
return 1;