X-Git-Url: http://developer.intra2net.com/git/?p=libftdi;a=blobdiff_plain;f=src%2Fftdi.c;h=41496ee1312e5337f25adeaaabc7510908458dd6;hp=bb40984f599a7aab01e4ae3da9e28f1391bb363a;hb=ce3940810901906eb00d67fe259d5540a9008630;hpb=1343f5841f27b505b762d5259e6e7a08643ecd46 diff --git a/src/ftdi.c b/src/ftdi.c index bb40984..41496ee 100644 --- a/src/ftdi.c +++ b/src/ftdi.c @@ -1956,7 +1956,7 @@ int ftdi_poll_modem_status(struct ftdi_context *ftdi, unsigned short *status) if (libusb_control_transfer(ftdi->usb_dev, FTDI_DEVICE_IN_REQTYPE, SIO_POLL_MODEM_STATUS_REQUEST, 0, ftdi->index, (unsigned char *)usb_val, 2, ftdi->usb_read_timeout) != 2) ftdi_error_return(-1, "getting modem status failed"); - *status = (usb_val[1] << 8) | usb_val[0]; + *status = (usb_val[1] << 8) | (usb_val[0] & 0xFF); return 0; }