diff options
| author | Bjørn Mork <bjorn@mork.no> | 2012-05-09 13:53:21 +0200 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2012-05-31 00:43:40 +0100 |
| commit | 26f15a29b18316e896973407efccebabbf8542f2 (patch) | |
| tree | 28cf6ab9c009804df37476861b255c8ba9bb2e28 /drivers/usb/class | |
| parent | 2dbbfc3960b2bef1dae52c3c5f85382dab0b427c (diff) | |
| download | kernel_samsung_smdk4412-26f15a29b18316e896973407efccebabbf8542f2.zip kernel_samsung_smdk4412-26f15a29b18316e896973407efccebabbf8542f2.tar.gz kernel_samsung_smdk4412-26f15a29b18316e896973407efccebabbf8542f2.tar.bz2 | |
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>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/usb/class')
| -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 cfe5be4..38d8c33 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) spin_lock_irqsave(&desc->iuspin, flags); if (test_bit(WDM_DISCONNECTING, &desc->flags)) { - mask = POLLERR; + mask = POLLHUP | POLLERR; spin_unlock_irqrestore(&desc->iuspin, flags); goto desc_out; } |