summaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/keyspan.c
diff options
context:
space:
mode:
authorRene Buergel <rene.buergel@sohard.de>2012-09-18 09:00:41 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-09-18 17:23:47 +0100
commitcc183e2a5ebfdddc8d3498149cae6b4c40551a68 (patch)
treec1e07cdd398ac4f535da041ada1cb9f145a36357 /drivers/usb/serial/keyspan.c
parent9fa5780beea1274d498a224822397100022da7d4 (diff)
downloadlinux-stable-cc183e2a5ebfdddc8d3498149cae6b4c40551a68.tar.gz
linux-stable-cc183e2a5ebfdddc8d3498149cae6b4c40551a68.tar.bz2
linux-stable-cc183e2a5ebfdddc8d3498149cae6b4c40551a68.zip
USB: ezusb: add support for Cypress FX2LP
This Patch adds support for the newer Cypress FX2LP. It also adapts three drivers currently using ezusb to the interface change. (whiteheat and keyspan[_pda]) 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.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/usb/serial/keyspan.c b/drivers/usb/serial/keyspan.c
index 566056cb04dc..4f25849d343e 100644
--- a/drivers/usb/serial/keyspan.c
+++ b/drivers/usb/serial/keyspan.c
@@ -43,6 +43,7 @@
#include <linux/uaccess.h>
#include <linux/usb.h>
#include <linux/usb/serial.h>
+#include <linux/usb/ezusb.h>
#include "keyspan.h"
/*
@@ -1245,7 +1246,7 @@ static int keyspan_fake_startup(struct usb_serial *serial)
dev_dbg(&serial->dev->dev, "Uploading Keyspan %s firmware.\n", fw_name);
/* download the firmware image */
- response = ezusb_set_reset(serial->dev, 1);
+ response = ezusb_fx1_set_reset(serial->dev, 1);
record = (const struct ihex_binrec *)fw->data;
@@ -1264,7 +1265,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->dev, 0);
+ response = ezusb_fx1_set_reset(serial->dev, 0);
/* we don't want this device to have a driver assigned to it. */
return 1;