X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=client%2FGoodFETMAXUSB.py;h=8f05d43d7ec6c60ea90e0e0f727d0ccb0b1dc199;hp=2559eb91504b44a831e8d5f14847434db06519f1;hb=2f6dc7ff6da98e249560706dd14a8cda9ad23e51;hpb=4d946fbe1f007d6d44960ed38784593ae64d603d

diff --git a/client/GoodFETMAXUSB.py b/client/GoodFETMAXUSB.py
index 2559eb9..8f05d43 100644
--- a/client/GoodFETMAXUSB.py
+++ b/client/GoodFETMAXUSB.py
@@ -529,9 +529,12 @@ class GoodFETMAXUSBHost(GoodFETMAXUSB):
         
         if index==0: return "MISSING STRING";
         
-        self.ctl_read(Get_Descriptor_String);
+        status=self.ctl_read(Get_Descriptor_String);
+        if status: return None;
+        
+        #Since we've got a string
         toret="";
-        for c in self.xfrdata:
+        for c in self.xfrdata[2:len(self.xfrdata)]:
             if c>0: toret=toret+chr(c);
         return toret;