X-Git-Url: http://developer.intra2net.com/git/?p=libftdi;a=blobdiff_plain;f=src%2Fftdi.c;h=d2c4a1163008fe27cb46129a527d2c2aa705b7a2;hp=9f12c41f852bb7697c0b70782861759b79f055ae;hb=ef6f483889aa3d719a676f7f32303c4232941e57;hpb=8af5bbc7a631bd63e9f3c3d0f702c1cfe6a27196 diff --git a/src/ftdi.c b/src/ftdi.c index 9f12c41..d2c4a11 100644 --- a/src/ftdi.c +++ b/src/ftdi.c @@ -454,12 +454,6 @@ int ftdi_usb_open_dev(struct ftdi_context *ftdi, struct usb_device *dev) ftdi_error_return(-6, "ftdi_usb_reset failed"); } - if (ftdi_set_baudrate (ftdi, 9600) != 0) - { - ftdi_usb_close_internal (ftdi); - ftdi_error_return(-7, "set baudrate failed"); - } - // Try to guess chip type // Bug in the BM type chips: bcdDevice is 0x200 for serial == 0 if (dev->descriptor.bcdDevice == 0x400 || (dev->descriptor.bcdDevice == 0x200 @@ -489,6 +483,12 @@ int ftdi_usb_open_dev(struct ftdi_context *ftdi, struct usb_device *dev) break; } + if (ftdi_set_baudrate (ftdi, 9600) != 0) + { + ftdi_usb_close_internal (ftdi); + ftdi_error_return(-7, "set baudrate failed"); + } + ftdi_error_return(0, "all fine"); }