Merge tag 'staging-5.7-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging (e7a1c733) · Commits · 戴 / test

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

MAINTAINERS

+0 −5

Original line number	Diff line number	Diff line
		@@ -7746,11 +7746,6 @@ L: platform-driver-x86@vger.kernel.org
		S: Orphan
		F: drivers/platform/x86/tc1100-wmi.c

		HP100: Driver for HP 10/100 Mbit/s Voice Grade Network Adapter Series
		M: Jaroslav Kysela <perex@perex.cz>
		S: Obsolete
		F: drivers/staging/hp/hp100.*

		HPET: High Precision Event Timers driver
		M: Clemens Ladisch <clemens@ladisch.de>
		S: Maintained

drivers/staging/gasket/gasket_core.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -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) {
		/*

drivers/staging/ks7010/TODO

+0 −1

Original line number	Diff line number	Diff line
		@@ -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>

Admin message