From: Thomas Jarosch <thomas.jarosch@intra2net.com>
Date: Fri, 6 May 2011 13:17:13 +0000 (+0200)
Subject: Correct ftdi_poll_modem_status() result code
X-Git-Tag: v1.0rc1~134
X-Git-Url: http://developer.intra2net.com/git/?p=libftdi;a=commitdiff_plain;h=ce3940810901906eb00d67fe259d5540a9008630

Correct ftdi_poll_modem_status() result code
---

diff --git a/AUTHORS b/AUTHORS
index b0f7e42..9a507fa 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -38,6 +38,7 @@ see Changelog for full details:
   Thimo Eichstaedt <abc@digithi.de>
   Thomas Fischl <fischl@fundf.net>
   Tim Ansell <mithro@mithis.com>
+  Tom Saunders <trsaunders@gmail.com>
   Uwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de>
   Vladimir Yakovlev <nagos@inbox.ru>
   Wilfried Holzke <libftdi@holzke.net>
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;
 }