diff options
| author | Mike Marshall <hubcap@omnibond.com> | 2016-01-15 14:22:14 -0500 |
|---|---|---|
| committer | Mike Marshall <hubcap@omnibond.com> | 2016-01-15 14:22:14 -0500 |
| commit | 5e1f3938f9e4ef539031d639879cb1cea870fab5 (patch) | |
| tree | b262a7c002b05b7bc800a106d6ca6777dabe15bf /drivers/usb/host/whci | |
| parent | 1808f8cc6cb2842c53147eccfd5e88044d0d22a6 (diff) | |
| parent | afd2ff9b7e1b367172f18ba7f693dfb62bdcb2dc (diff) | |
| download | linux-rt-5e1f3938f9e4ef539031d639879cb1cea870fab5.tar.gz | |
Orangefs: merge with V4.4
Merge tag 'v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into current
Linux 4.4
Diffstat (limited to 'drivers/usb/host/whci')
| -rw-r--r-- | drivers/usb/host/whci/qset.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/usb/host/whci/qset.c b/drivers/usb/host/whci/qset.c index dc31c425ce01..9f1c0538b211 100644 --- a/drivers/usb/host/whci/qset.c +++ b/drivers/usb/host/whci/qset.c @@ -377,6 +377,10 @@ static int qset_fill_page_list(struct whc *whc, struct whc_std *std, gfp_t mem_f if (std->pl_virt == NULL) return -ENOMEM; std->dma_addr = dma_map_single(whc->wusbhc.dev, std->pl_virt, pl_len, DMA_TO_DEVICE); + if (dma_mapping_error(whc->wusbhc.dev, std->dma_addr)) { + kfree(std->pl_virt); + return -EFAULT; + } for (p = 0; p < std->num_pointers; p++) { std->pl_virt[p].buf_ptr = cpu_to_le64(dma_addr); |