Browse Source

Bluetooth: Fix issue with USB suspend in btusb driver

Suspend could fail for some platforms because
btusb_suspend==> btusb_stop_traffic ==> usb_kill_anchored_urbs.

When btusb_bulk_complete returns before system suspend and resubmits
an URB, the system cannot enter suspend state.

Signed-off-by: Champion Chen <champion_chen@realsil.com.cn>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Cc: stable@vger.kernel.org
Champion Chen 11 years ago
parent
commit
85560c4a82
1 changed files with 9 additions and 0 deletions
  1. 9 0
      drivers/bluetooth/btusb.c

+ 9 - 0
drivers/bluetooth/btusb.c

@@ -331,6 +331,9 @@ static void btusb_intr_complete(struct urb *urb)
 			BT_ERR("%s corrupted event packet", hdev->name);
 			BT_ERR("%s corrupted event packet", hdev->name);
 			hdev->stat.err_rx++;
 			hdev->stat.err_rx++;
 		}
 		}
+	} else if (urb->status == -ENOENT) {
+		/* Avoid suspend failed when usb_kill_urb */
+		return;
 	}
 	}
 
 
 	if (!test_bit(BTUSB_INTR_RUNNING, &data->flags))
 	if (!test_bit(BTUSB_INTR_RUNNING, &data->flags))
@@ -419,6 +422,9 @@ static void btusb_bulk_complete(struct urb *urb)
 			BT_ERR("%s corrupted ACL packet", hdev->name);
 			BT_ERR("%s corrupted ACL packet", hdev->name);
 			hdev->stat.err_rx++;
 			hdev->stat.err_rx++;
 		}
 		}
+	} else if (urb->status == -ENOENT) {
+		/* Avoid suspend failed when usb_kill_urb */
+		return;
 	}
 	}
 
 
 	if (!test_bit(BTUSB_BULK_RUNNING, &data->flags))
 	if (!test_bit(BTUSB_BULK_RUNNING, &data->flags))
@@ -513,6 +519,9 @@ static void btusb_isoc_complete(struct urb *urb)
 				hdev->stat.err_rx++;
 				hdev->stat.err_rx++;
 			}
 			}
 		}
 		}
+	} else if (urb->status == -ENOENT) {
+		/* Avoid suspend failed when usb_kill_urb */
+		return;
 	}
 	}
 
 
 	if (!test_bit(BTUSB_ISOC_RUNNING, &data->flags))
 	if (!test_bit(BTUSB_ISOC_RUNNING, &data->flags))