Merge branch 'for-linus' of git://git.infradead.org/~dedekind/ubi-2.6

[sfrench/cifs-2.6.git] / drivers / usb / host / isp116x.h

diff --git a/drivers/usb/host/isp116x.h b/drivers/usb/host/isp116x.h
index a1b7c3813d3a955321d08961b0a5fc98faecbff4..595b90a9984880c819011ad4e181a223d8d6d50b 100644 (file)
--- a/drivers/usb/host/isp116x.h
+++ b/drivers/usb/host/isp116x.h
@@ -233,7 +233,7 @@ static const int cc_to_error[16] = {
        /* Bit Stuff  */ -EPROTO,
        /* Data Togg  */ -EILSEQ,
        /* Stall      */ -EPIPE,
-       /* DevNotResp */ -ETIMEDOUT,
+       /* DevNotResp */ -ETIME,
        /* PIDCheck   */ -EPROTO,
        /* UnExpPID   */ -EPROTO,
        /* DataOver   */ -EOVERFLOW,
@@ -270,7 +270,6 @@ struct isp116x {
        u32 rhdesca;
        u32 rhdescb;
        u32 rhstatus;
-       u32 rhport[2];
 
        /* async schedule: control, bulk */
        struct list_head async;