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
Unified · Split
| @@ -7746,11 +7746,6 @@ L: platform-driver-x86@vger.kernel.org · 7745 unmodified lines | |||
| 7746 | S: Orphan | 7746 | S: Orphan |
| 7747 | F: drivers/platform/x86/tc1100-wmi.c | 7747 | F: drivers/platform/x86/tc1100-wmi.c |
| 7748 | 7748 | ||
| 7749 | HP100: Driver for HP 10/100 Mbit/s Voice Grade Network Adapter Series | ||
| 7750 | M: Jaroslav Kysela <perex@perex.cz> | ||
| 7751 | S: Obsolete | ||
| 7752 | F: drivers/staging/hp/hp100.* | ||
| 7753 | |||
| 7754 | HPET: High Precision Event Timers driver | 7749 | HPET: High Precision Event Timers driver |
| 7755 | M: Clemens Ladisch <clemens@ladisch.de> | 7750 | M: Clemens Ladisch <clemens@ladisch.de> |
| 7756 | S: Maintained | 7751 | S: Maintained |
| @@ -925,6 +925,10 @@ do_map_region(const struct gasket_dev *gasket_dev, struct vm_area_struct *vma, · 924 unmodified lines | |||
| 925 | gasket_get_bar_index(gasket_dev, | 925 | gasket_get_bar_index(gasket_dev, |
| 926 | (vma->vm_pgoff << PAGE_SHIFT) + | 926 | (vma->vm_pgoff << PAGE_SHIFT) + |
| 927 | driver_desc->legacy_mmap_address_offset); | 927 | driver_desc->legacy_mmap_address_offset); |
| 928 | |||
| 929 | if (bar_index < 0) | ||
| 930 | return DO_MAP_REGION_INVALID; | ||
| 931 | |||
| 928 | phys_base = gasket_dev->bar_data[bar_index].phys_base + phys_offset; | 932 | phys_base = gasket_dev->bar_data[bar_index].phys_base + phys_offset; |
| 929 | while (mapped_bytes < map_length) { | 933 | while (mapped_bytes < map_length) { |
| 930 | /* | 934 | /* |
| @@ -30,5 +30,4 @@ Now the TODOs: · 29 unmodified lines | |||
| 30 | 30 | ||
| 31 | Please send any patches to: | 31 | Please send any patches to: |
| 32 | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 32 | Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| 33 | Wolfram Sang <wsa@the-dreams.de> | ||
| 34 | Linux Driver Project Developer List <driverdev-devel@linuxdriverproject.org> | 33 | Linux Driver Project Developer List <driverdev-devel@linuxdriverproject.org> |