Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e5445835 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.19.259 into android-4.19-stable 



Changes in 4.19.259
	drm/msm/rd: Fix FIFO-full deadlock
	HID: ishtp-hid-clientHID: ishtp-hid-client: Fix comment typo
	tg3: Disable tg3 device on system reboot to avoid triggering AER
	ieee802154: cc2520: add rc code in cc2520_tx()
	Input: iforce - add support for Boeder Force Feedback Wheel
	perf/arm_pmu_platform: fix tests for platform_get_irq() failure
	platform/x86: acer-wmi: Acer Aspire One AOD270/Packard Bell Dot keymap fixes
	usb: storage: Add ASUS <0x0b05:0x1932> to IGNORE_UAS
	mm: Fix TLB flush for not-first PFNMAP mappings in unmap_region()
	net: dp83822: disable rx error interrupt
	tracefs: Only clobber mode/uid/gid on remount if asked
	Linux 4.19.259

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I4dd44713b06f34580e64c574fc5b09a3fe132880
parents a873b7b9 970451bc

Documentation/input/joydev/joystick.rst

+1 −0
Original line number Diff line number Diff line
@@ -517,6 +517,7 @@ All I-Force devices are supported by the iforce module. This includes: 
* AVB Mag Turbo Force

* AVB Top Shot Pegasus

* AVB Top Shot Force Feedback Racing Wheel

* Boeder Force Feedback Wheel

* Logitech WingMan Force

* Logitech WingMan Force Wheel

* Guillemot Race Leader Force Feedback

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 258

SUBLEVEL = 259

EXTRAVERSION =

NAME = "People's Front"

drivers/gpu/drm/msm/msm_rd.c

+3 −0
Original line number Diff line number Diff line
@@ -199,6 +199,9 @@ static int rd_open(struct inode *inode, struct file *file) 
	file->private_data = rd;

	rd->open = true;



	/* Reset fifo to clear any previously unread data: */

	rd->fifo.head = rd->fifo.tail = 0;



	/* the parsing tools need to know gpu-id to know which

	 * register database to load.

	 */

drivers/hid/intel-ish-hid/ishtp-hid.h

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ struct report_list { 
 * @multi_packet_cnt:	Count of fragmented packet count

 *

 * This structure is used to store completion flags and per client data like

 * like report description, number of HID devices etc.

 * report description, number of HID devices etc.

 */

struct ishtp_cl_data {

	/* completion flags */

drivers/input/joystick/iforce/iforce-main.c

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ static struct iforce_device iforce_device[] = { 
	{ 0x046d, 0xc291, "Logitech WingMan Formula Force",		btn_wheel, abs_wheel, ff_iforce },

	{ 0x05ef, 0x020a, "AVB Top Shot Pegasus",			btn_joystick_avb, abs_avb_pegasus, ff_iforce },

	{ 0x05ef, 0x8884, "AVB Mag Turbo Force",			btn_wheel, abs_wheel, ff_iforce },

	{ 0x05ef, 0x8886, "Boeder Force Feedback Wheel",		btn_wheel, abs_wheel, ff_iforce },

	{ 0x05ef, 0x8888, "AVB Top Shot Force Feedback Racing Wheel",	btn_wheel, abs_wheel, ff_iforce }, //?

	{ 0x061c, 0xc0a4, "ACT LABS Force RS",                          btn_wheel, abs_wheel, ff_iforce }, //?

	{ 0x061c, 0xc084, "ACT LABS Force RS",				btn_wheel, abs_wheel, ff_iforce },