diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-09-21 09:06:42 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-09-21 09:06:42 +0200 |
| commit | 629b9111535f2a2607bbea1599d285a25f32835d (patch) | |
| tree | 81a37df4e13842d5ea3d54b619e929e2b6e9ffed /drivers/usb/class | |
| parent | usb: xhci: add debugfs support for ep with stream (diff) | |
| parent | Linux 5.9-rc6 (diff) | |
| download | linux-629b9111535f2a2607bbea1599d285a25f32835d.tar.xz linux-629b9111535f2a2607bbea1599d285a25f32835d.zip | |
Merge 5.0-rc6 into usb-next
We want the USB fixes in here, and this resolves a merge issue in the
uas driver.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/class')
| -rw-r--r-- | drivers/usb/class/usblp.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/usb/class/usblp.c b/drivers/usb/class/usblp.c index 084c48c5848f..67cbd42421be 100644 --- a/drivers/usb/class/usblp.c +++ b/drivers/usb/class/usblp.c @@ -827,6 +827,11 @@ static ssize_t usblp_read(struct file *file, char __user *buffer, size_t len, lo if (rv < 0) return rv; + if (!usblp->present) { + count = -ENODEV; + goto done; + } + if ((avail = usblp->rstatus) < 0) { printk(KERN_ERR "usblp%d: error %d reading from printer\n", usblp->minor, (int)avail); |