diff options
| author | Ilya A. Volynets-Evenbakh <ilya@total-knowledge.com> | 2012-08-14 01:32:46 +0000 |
|---|---|---|
| committer | Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at> | 2012-08-14 01:32:46 +0000 |
| commit | 7c36d5265273479b4de8e3394d308744709d84de (patch) | |
| tree | f88812d4a46f47a652718abd7f89e3c233569e81 /ft2232_spi.c | |
| parent | 8dd97f9c9e01a01cfd84ebbeb1bb936b55cb017a (diff) | |
| download | flashrom-7c36d5265273479b4de8e3394d308744709d84de.tar.gz flashrom-7c36d5265273479b4de8e3394d308744709d84de.tar.bz2 flashrom-7c36d5265273479b4de8e3394d308744709d84de.zip | |
Call ftdi_set_interface right after ftdi_init and before ftdi_usb_open
Else libftdi complains that it is impossible to set interface on an already
open device since 1c5fa36b67bc30742eee94ed3e3648fcd4640f24
(which will probably end up in libftdi 0.21).
Corresponding to flashrom svn r1573.
Signed-off-by: Ilya A. Volynets-Evenbakh <ilya@total-knowledge.com>
Acked-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
Diffstat (limited to 'ft2232_spi.c')
| -rw-r--r-- | ft2232_spi.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/ft2232_spi.c b/ft2232_spi.c index a5d382835..d599a8ae6 100644 --- a/ft2232_spi.c +++ b/ft2232_spi.c @@ -277,6 +277,10 @@ int ft2232_spi_init(void) return -3; } + if (ftdi_set_interface(ftdic, ft2232_interface) < 0) { + msg_perr("Unable to select interface: %s\n", ftdic->error_str); + } + f = ftdi_usb_open(ftdic, ft2232_vid, ft2232_type); if (f < 0 && f != -5) { @@ -291,11 +295,6 @@ int ft2232_spi_init(void) clock_5x = 0; } - if (ftdi_set_interface(ftdic, ft2232_interface) < 0) { - msg_perr("Unable to select interface: %s\n", - ftdic->error_str); - } - if (ftdi_usb_reset(ftdic) < 0) { msg_perr("Unable to reset FTDI device\n"); } |