Merge /spare/repo/linux-2.6/

1 files changed, 15 insertions, 11 deletions

diff --git a/drivers/isdn/hisax/st5481_d.c b/drivers/isdn/hisax/st5481_d.c
index 071b1d31999f..941f7022ada1 100644
--- a/drivers/isdn/hisax/st5481_d.c
+++ b/drivers/isdn/hisax/st5481_d.c
@@ -382,16 +382,20 @@ static void usb_d_out_complete(struct urb *urb, struct pt_regs *regs)
         test_and_clear_bit(buf_nr, &d_out->busy);
 
         if (unlikely(urb->status < 0)) {
-                if (urb->status != -ENOENT && urb->status != -ESHUTDOWN) {
-                        WARN("urb status %d",urb->status);
-                        if (d_out->busy == 0) {
-                                st5481_usb_pipe_reset(adapter, EP_D_OUT | USB_DIR_OUT, fifo_reseted, adapter);
-                        }
-                        return;
-                } else {
-                        DBG(1,"urb killed"); 
-                        return; // Give up
+                switch (urb->status) {
+                        case -ENOENT:
+                        case -ESHUTDOWN:
+                        case -ECONNRESET:
+                                DBG(1,"urb killed status %d", urb->status);
+                                break;
+                        default: 
+                                WARN("urb status %d",urb->status);
+                                if (d_out->busy == 0) {
+                                        st5481_usb_pipe_reset(adapter, EP_D_OUT | USB_DIR_OUT, fifo_reseted, adapter);
+                                }
+                                break;
                 }
+                return; // Give up
         }
 
         FsmEvent(&adapter->d_out.fsm, EV_DOUT_COMPLETE, (void *) buf_nr);
@@ -709,14 +713,14 @@ int st5481_setup_d(struct st5481_adapter *adapter)
 
         adapter->l1m.fsm = &l1fsm;
         adapter->l1m.state = ST_L1_F3;
-        adapter->l1m.debug = 1;
+        adapter->l1m.debug = st5481_debug & 0x100;
         adapter->l1m.userdata = adapter;
         adapter->l1m.printdebug = l1m_debug;
         FsmInitTimer(&adapter->l1m, &adapter->timer);
 
         adapter->d_out.fsm.fsm = &dout_fsm;
         adapter->d_out.fsm.state = ST_DOUT_NONE;
-        adapter->d_out.fsm.debug = 1;
+        adapter->d_out.fsm.debug = st5481_debug & 0x100;
         adapter->d_out.fsm.userdata = adapter;
         adapter->d_out.fsm.printdebug = dout_debug;