Skip to content

Commit e7a1c73

Browse files
committed
Merge tag 'staging-5.7-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging driver fixes from Greg KH: "Here are three small driver fixes for 5.7-rc5. Two of these are documentation fixes: - MAINTAINERS update due to removed driver - removing Wolfram from the ks7010 driver TODO file The other patch is a real fix: - fix gasket driver to proper check the return value of a call All of these have been in linux-next for a while with no reported issues" * tag 'staging-5.7-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: staging: gasket: Check the return value of gasket_get_bar_index() staging: ks7010: remove me from CC list MAINTAINERS: remove entry after hp100 driver removal
2 parents cbd0e48 + 769acc3 commit e7a1c73

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

MAINTAINERS

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7746,11 +7746,6 @@ L: [email protected]
77467746
S: Orphan
77477747
F: drivers/platform/x86/tc1100-wmi.c
77487748

7749-
HP100: Driver for HP 10/100 Mbit/s Voice Grade Network Adapter Series
7750-
M: Jaroslav Kysela <[email protected]>
7751-
S: Obsolete
7752-
F: drivers/staging/hp/hp100.*
7753-
77547749
HPET: High Precision Event Timers driver
77557750
M: Clemens Ladisch <[email protected]>
77567751
S: Maintained

drivers/staging/gasket/gasket_core.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -925,6 +925,10 @@ do_map_region(const struct gasket_dev *gasket_dev, struct vm_area_struct *vma,
925925
gasket_get_bar_index(gasket_dev,
926926
(vma->vm_pgoff << PAGE_SHIFT) +
927927
driver_desc->legacy_mmap_address_offset);
928+
929+
if (bar_index < 0)
930+
return DO_MAP_REGION_INVALID;
931+
928932
phys_base = gasket_dev->bar_data[bar_index].phys_base + phys_offset;
929933
while (mapped_bytes < map_length) {
930934
/*

drivers/staging/ks7010/TODO

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,4 @@ Now the TODOs:
3030

3131
Please send any patches to:
3232
Greg Kroah-Hartman <[email protected]>
33-
Wolfram Sang <[email protected]>
3433
Linux Driver Project Developer List <[email protected]>

0 commit comments

Comments
 (0)