|
@@ -690,6 +690,9 @@ static int generic_ocp_read(struct r8152 *tp, u16 index, u16 size,
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ if (ret == -ENODEV)
|
|
|
|
+ set_bit(RTL8152_UNPLUG, &tp->flags);
|
|
|
|
+
|
|
return ret;
|
|
return ret;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -757,6 +760,9 @@ static int generic_ocp_write(struct r8152 *tp, u16 index, u16 byteen,
|
|
}
|
|
}
|
|
|
|
|
|
error1:
|
|
error1:
|
|
|
|
+ if (ret == -ENODEV)
|
|
|
|
+ set_bit(RTL8152_UNPLUG, &tp->flags);
|
|
|
|
+
|
|
return ret;
|
|
return ret;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1083,6 +1089,7 @@ static void read_bulk_callback(struct urb *urb)
|
|
|
|
|
|
result = r8152_submit_rx(tp, agg, GFP_ATOMIC);
|
|
result = r8152_submit_rx(tp, agg, GFP_ATOMIC);
|
|
if (result == -ENODEV) {
|
|
if (result == -ENODEV) {
|
|
|
|
+ set_bit(RTL8152_UNPLUG, &tp->flags);
|
|
netif_device_detach(tp->netdev);
|
|
netif_device_detach(tp->netdev);
|
|
} else if (result) {
|
|
} else if (result) {
|
|
spin_lock(&tp->rx_lock);
|
|
spin_lock(&tp->rx_lock);
|
|
@@ -1187,11 +1194,13 @@ static void intr_callback(struct urb *urb)
|
|
|
|
|
|
resubmit:
|
|
resubmit:
|
|
res = usb_submit_urb(urb, GFP_ATOMIC);
|
|
res = usb_submit_urb(urb, GFP_ATOMIC);
|
|
- if (res == -ENODEV)
|
|
|
|
|
|
+ if (res == -ENODEV) {
|
|
|
|
+ set_bit(RTL8152_UNPLUG, &tp->flags);
|
|
netif_device_detach(tp->netdev);
|
|
netif_device_detach(tp->netdev);
|
|
- else if (res)
|
|
|
|
|
|
+ } else if (res) {
|
|
netif_err(tp, intr, tp->netdev,
|
|
netif_err(tp, intr, tp->netdev,
|
|
"can't resubmit intr, status %d\n", res);
|
|
"can't resubmit intr, status %d\n", res);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
static inline void *rx_agg_align(void *data)
|
|
static inline void *rx_agg_align(void *data)
|
|
@@ -1755,6 +1764,7 @@ static void tx_bottom(struct r8152 *tp)
|
|
struct net_device *netdev = tp->netdev;
|
|
struct net_device *netdev = tp->netdev;
|
|
|
|
|
|
if (res == -ENODEV) {
|
|
if (res == -ENODEV) {
|
|
|
|
+ set_bit(RTL8152_UNPLUG, &tp->flags);
|
|
netif_device_detach(netdev);
|
|
netif_device_detach(netdev);
|
|
} else {
|
|
} else {
|
|
struct net_device_stats *stats = &netdev->stats;
|
|
struct net_device_stats *stats = &netdev->stats;
|