From: Anthony Liguori <aliguori@us.ibm.com>
Date: Wed, 17 Mar 2010 21:00:24 +0000 (-0500)
Subject: Revert "usb-linux: remove unreachable default in switch statement"
X-Git-Tag: last_qemu_master~680
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=ddbda4323e2bdc7cb3925b0f4080f9eb836a09e8;p=qemu-xen-unstable.git

Revert "usb-linux: remove unreachable default in switch statement"

This reverts commit 3c9c706c3b66d838942aba53c0d3fdcdf06c7423.

This breaks build (gcc 4.3.2):
    CC    usb-linux.o
 cc1: warnings being treated as errors
 /src/qemu/usb-linux.c: In function 'usb_linux_update_endp_table':
 /src/qemu/usb-linux.c:759: error: 'type' may be used uninitialized in
 this function

Reported-by: Blue Swirl <blauwirbel@gmail.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

diff --git a/usb-linux.c b/usb-linux.c
index 1ecfbc4565..d0d7cff496 100644
--- a/usb-linux.c
+++ b/usb-linux.c
@@ -846,6 +846,9 @@ static int usb_linux_update_endp_table(USBHostDevice *s)
             case 0x03:
                 type = USBDEVFS_URB_TYPE_INTERRUPT;
                 break;
+            default:
+                DPRINTF("usb_host: malformed endpoint type\n");
+                type = USBDEVFS_URB_TYPE_BULK;
             }
             s->endp_table[(devep & 0xf) - 1].type = type;
             s->endp_table[(devep & 0xf) - 1].halted = 0;