diff options
author | Peter Zijlstra <peterz@infradead.org> | 2020-05-19 20:34:12 +0200 |
---|---|---|
committer | Peter Zijlstra <peterz@infradead.org> | 2020-05-19 20:34:12 +0200 |
commit | 9013196a467e770e1470cccee6c0fe435ef37c66 (patch) | |
tree | 2aefbb9d14a1a7513af9e752fe5bb80cf6b00c0c /drivers/staging | |
parent | 2a0a24ebb499c9d499eea948d3fc108f936e36d4 (diff) | |
parent | 39f23ce07b9355d05a64ae303ce20d1c4b92b957 (diff) | |
download | linux-9013196a467e770e1470cccee6c0fe435ef37c66.tar.bz2 |
Merge branch 'sched/urgent'
Diffstat (limited to 'drivers/staging')
-rw-r--r-- | drivers/staging/gasket/gasket_core.c | 4 | ||||
-rw-r--r-- | drivers/staging/ks7010/TODO | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/staging/gasket/gasket_core.c b/drivers/staging/gasket/gasket_core.c index 8e0575fcb4c8..67325fbaf760 100644 --- a/drivers/staging/gasket/gasket_core.c +++ b/drivers/staging/gasket/gasket_core.c @@ -925,6 +925,10 @@ do_map_region(const struct gasket_dev *gasket_dev, struct vm_area_struct *vma, gasket_get_bar_index(gasket_dev, (vma->vm_pgoff << PAGE_SHIFT) + driver_desc->legacy_mmap_address_offset); + + if (bar_index < 0) + return DO_MAP_REGION_INVALID; + phys_base = gasket_dev->bar_data[bar_index].phys_base + phys_offset; while (mapped_bytes < map_length) { /* diff --git a/drivers/staging/ks7010/TODO b/drivers/staging/ks7010/TODO index 87a6dac4890d..ab6f39175d99 100644 --- a/drivers/staging/ks7010/TODO +++ b/drivers/staging/ks7010/TODO @@ -30,5 +30,4 @@ Now the TODOs: Please send any patches to: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -Wolfram Sang <wsa@the-dreams.de> Linux Driver Project Developer List <driverdev-devel@linuxdriverproject.org> |