Merge branch 'master' into HEAD

This commit is contained in:
Cristian Maglie 2014-05-30 10:54:14 +02:00
commit 82fe44d76d
1 changed files with 1 additions and 1 deletions

View File

@ -129,7 +129,7 @@ void Serial_::end(void)
int Serial_::available(void)
{
if (peek_buffer >= 0) {
return 1;
return 1 + USB_Available(CDC_RX);
}
return USB_Available(CDC_RX);
}