diff options
author | Bjørn Mork <bjorn@mork.no> | 2012-05-09 07:53:21 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-01 03:12:55 -0400 |
commit | bfd6d6af769c5cd62aa9ed75b038ea3d234b090b (patch) | |
tree | 6ccdc947dad33041a50ccd4d1f7e8707ee52c92d | |
parent | 53a8734d0b66c7fb78e6cb6f0d2a559e3a255f9e (diff) |
USB: cdc-wdm: poll must return POLLHUP if device is gone
commit 616b6937e348ef2b4c6ea5fef2cd3c441145efb0 upstream.
Else the poll will be restarted indefinitely in a tight loop,
preventing final device cleanup.
Cc: Oliver Neukum <oliver@neukum.org>
Signed-off-by: Bjørn Mork <bjorn@mork.no>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/usb/class/cdc-wdm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/class/cdc-wdm.c b/drivers/usb/class/cdc-wdm.c index 00b7bf9a20c..5a244cfbeb4 100644 --- a/drivers/usb/class/cdc-wdm.c +++ b/drivers/usb/class/cdc-wdm.c | |||
@@ -511,7 +511,7 @@ static unsigned int wdm_poll(struct file *file, struct poll_table_struct *wait) | |||
511 | 511 | ||
512 | spin_lock_irqsave(&desc->iuspin, flags); | 512 | spin_lock_irqsave(&desc->iuspin, flags); |
513 | if (test_bit(WDM_DISCONNECTING, &desc->flags)) { | 513 | if (test_bit(WDM_DISCONNECTING, &desc->flags)) { |
514 | mask = POLLERR; | 514 | mask = POLLHUP | POLLERR; |
515 | spin_unlock_irqrestore(&desc->iuspin, flags); | 515 | spin_unlock_irqrestore(&desc->iuspin, flags); |
516 | goto desc_out; | 516 | goto desc_out; |
517 | } | 517 | } |