diff options
| author | Bjørn Mork <bjorn@mork.no> | 2012-05-09 13:53:21 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-11 15:19:22 -0700 |
| commit | 616b6937e348ef2b4c6ea5fef2cd3c441145efb0 (patch) | |
| tree | 0bd0944b6ee1a84b45dc7f002c05ebba204fc965 /drivers/usb/class | |
| parent | b8cacf33f09c60208a914b36b3e6de8e9ba228d5 (diff) | |
| download | op-kernel-dev-616b6937e348ef2b4c6ea5fef2cd3c441145efb0.zip op-kernel-dev-616b6937e348ef2b4c6ea5fef2cd3c441145efb0.tar.gz | |
USB: cdc-wdm: poll must return POLLHUP if device is gone
Else the poll will be restarted indefinitely in a tight loop,
preventing final device cleanup.
Cc: Oliver Neukum <oliver@neukum.org>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Bjørn Mork <bjorn@mork.no>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 5d15165..7652275 100644 --- a/drivers/usb/class/cdc-wdm.c +++ b/drivers/usb/class/cdc-wdm.c @@ -548,7 +548,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; } |
