diff --git a/libusb/descriptor.c b/libusb/descriptor.c
index 74d6de5..0b0e314 100644
--- a/libusb/descriptor.c
+++ b/libusb/descriptor.c
@@ -1174,7 +1174,7 @@ int API_EXPORTED libusb_get_string_descriptor_ascii(libusb_device_handle *dev_ha
 		return LIBUSB_ERROR_IO;
 
 	if (tbuf[0] > r)
-		return LIBUSB_ERROR_IO;
+		tbuf[0] = r;
 
 	di = 0;
 	for (si = 2; si < tbuf[0]; si += 2) {
-- 
2.17.0

img src='https://git.koszko.org/cgit-static/cgit.png' alt='cgit logo'/></a></td>
<td class='main'><a href='/'>index</a> : <a href='/guix/'>guix</a></td><td class='form'><form method='get'>
<input type='hidden' name='id' value='91a9c65c7bae73d999ccc2288833e909ce4a0871'/><select name='h' onchange='this.form.submit();'>
<option value='koszko' selected='selected'>koszko</option>
<option value='koszko-scripts'>koszko-scripts</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>Wojtek's customized Guix</td><td class='sub right'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=91a9c65c7bae73d999ccc2288833e909ce4a0871'>refs</a><a class='active' href='/guix/log/nix/libutil'>log</a><a href='/guix/tree/nix/libutil?id=91a9c65c7bae73d999ccc2288833e909ce4a0871'>tree</a><a href='/guix/commit/nix/libutil?id=91a9c65c7bae73d999ccc2288833e909ce4a0871'>commit</a><a href='/guix/diff/nix/libutil?id=91a9c65c7bae73d999ccc2288833e909ce4a0871'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/nix/libutil'>
<input type='hidden' name='id' value='91a9c65c7bae73d999ccc2288833e909ce4a0871'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=91a9c65c7bae73d999ccc2288833e909ce4a0871'>root</a>/<a href='/guix/log/nix?id=91a9c65c7bae73d999ccc2288833e909ce4a0871'>nix</a>/<a href='/guix/log/nix/libutil?id=91a9c65c7bae73d999ccc2288833e909ce4a0871'>libutil</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/nix/libutil?id=91a9c65c7bae73d999ccc2288833e909ce4a0871&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2016-05-31 18:22:14 +0200'>2016-05-31</span></td><td><a href='/guix/commit/nix/libutil?id=75abbd0cbe2c42f07fa104f97bd206891eb576ef'>daemon: Remove unused XML output code.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2015-12-02 19:37:59 +0200'>2015-12-02</span></td><td><a href='/guix/commit/nix/libutil?id=14fb686a21d786afa699a38d20929a88be6e541d'>daemon: Fix namespace issue.</a></td><td>Eelco Dolstra</td></tr>
<tr><td><span title='2015-12-02 19:37:59 +0200'>2015-12-02</span></td><td><a href='/guix/commit/nix/libutil?id=29d3242e5c428d3b0e8dc9db1c81cd4053e5271c'>daemon: Support SHA-512 hashes.</a><span class='msg-avail'>...</span></td><td>Eelco Dolstra</td></tr>
<tr><td><span title='2015-12-02 19:37:59 +0200'>2015-12-02</span></td><td><a href='/guix/commit/nix/libutil?id=79aa1a83054af1600ba235ddf305337b5df78271'>daemon: int2String -&gt; std::to_string.</a></td><td>Eelco Dolstra</td></tr>
<tr><td><span title='2015-07-03 00:30:55 +0200'>2015-07-03</span></td><td><a href='/guix/commit/nix/libutil?id=322eeb87d0e5bb608ae1c176611a50297c93cbe8'>Merge branch 'nix'.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2015-06-03 22:59:02 +0200'>2015-06-03</span></td><td><a href='/guix/commit/nix/libutil?id=54c260e6ecc81f1836bda844ec8e661d51bfb867'>Merge branch 'nix'.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2015-05-19 16:09:58 +0200'>2015-05-19</span></td><td><a href='/guix/commit/nix/libutil?id=2bb04905f86f9c3f1d27557fbff8cbdc776560a3'>Merge branch 'nix'.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2015-05-19 16:09:58 +0200'>2015-05-19</span></td><td><a href='/guix/commit/nix/libutil?id=a88b8c5c985a87586159c0621974a1dfe5b9b92d'>Revert "daemon: Fix possible use-after-free."</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2015-05-11 23:01:20 +0200'>2015-05-11</span></td><td><a href='/guix/commit/nix/libutil?id=1303a4a4517260def862ce7fe97e6b28dd8005e1'>daemon: Fix possible use-after-free.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>