uefi-x86-current: rewrite patches
This commit is contained in:
parent
11823ab0d1
commit
ce2506ddf1
@ -236,7 +236,7 @@ diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hid/hid-apple.c
|
||||
+++ b/drivers/hid/hid-apple.c
|
||||
@@ -517,6 +517,15 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input,
|
||||
@@ -518,6 +518,15 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input,
|
||||
table = macbookair_fn_keys;
|
||||
else if (hid->product < 0x21d || hid->product >= 0x300)
|
||||
table = powerbook_fn_keys;
|
||||
@ -252,7 +252,7 @@ index 111111111111..222222222222 100644
|
||||
else
|
||||
table = apple_fn_keys;
|
||||
}
|
||||
@@ -937,6 +946,10 @@ static int apple_probe(struct hid_device *hdev,
|
||||
@@ -938,6 +947,10 @@ static int apple_probe(struct hid_device *hdev,
|
||||
struct apple_sc *asc;
|
||||
int ret;
|
||||
|
||||
@ -263,7 +263,7 @@ index 111111111111..222222222222 100644
|
||||
asc = devm_kzalloc(&hdev->dev, sizeof(*asc), GFP_KERNEL);
|
||||
if (asc == NULL) {
|
||||
hid_err(hdev, "can't alloc apple descriptor\n");
|
||||
@@ -1215,6 +1228,8 @@ static const struct hid_device_id apple_devices[] = {
|
||||
@@ -1216,6 +1229,8 @@ static const struct hid_device_id apple_devices[] = {
|
||||
.driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK | APPLE_RDESC_BATTERY },
|
||||
{ HID_BLUETOOTH_DEVICE(BT_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_2024),
|
||||
.driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK },
|
||||
@ -291,7 +291,7 @@ diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hid/hid-apple.c
|
||||
+++ b/drivers/hid/hid-apple.c
|
||||
@@ -517,9 +517,10 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input,
|
||||
@@ -518,9 +518,10 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input,
|
||||
table = macbookair_fn_keys;
|
||||
else if (hid->product < 0x21d || hid->product >= 0x300)
|
||||
table = powerbook_fn_keys;
|
||||
@ -303,7 +303,7 @@ index 111111111111..222222222222 100644
|
||||
table = macbookpro_dedicated_esc_fn_keys;
|
||||
break;
|
||||
default:
|
||||
@@ -946,7 +947,7 @@ static int apple_probe(struct hid_device *hdev,
|
||||
@@ -947,7 +948,7 @@ static int apple_probe(struct hid_device *hdev,
|
||||
struct apple_sc *asc;
|
||||
int ret;
|
||||
|
||||
@ -312,7 +312,7 @@ index 111111111111..222222222222 100644
|
||||
hdev->type != HID_TYPE_SPI_KEYBOARD)
|
||||
return -ENODEV;
|
||||
|
||||
@@ -1230,6 +1231,8 @@ static const struct hid_device_id apple_devices[] = {
|
||||
@@ -1231,6 +1232,8 @@ static const struct hid_device_id apple_devices[] = {
|
||||
.driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK },
|
||||
{ HID_SPI_DEVICE(SPI_VENDOR_ID_APPLE, HID_ANY_ID),
|
||||
.driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK },
|
||||
|
||||
@ -25,7 +25,7 @@ index 111111111111..222222222222 100644
|
||||
#define APPLE_HAS_FN BIT(2)
|
||||
/* BIT(3) reserved, was: APPLE_HIDDEV */
|
||||
#define APPLE_ISO_TILDE_QUIRK BIT(4)
|
||||
@@ -951,6 +951,9 @@ static int apple_probe(struct hid_device *hdev,
|
||||
@@ -952,6 +952,9 @@ static int apple_probe(struct hid_device *hdev,
|
||||
hdev->type != HID_TYPE_SPI_KEYBOARD)
|
||||
return -ENODEV;
|
||||
|
||||
@ -35,7 +35,7 @@ index 111111111111..222222222222 100644
|
||||
asc = devm_kzalloc(&hdev->dev, sizeof(*asc), GFP_KERNEL);
|
||||
if (asc == NULL) {
|
||||
hid_err(hdev, "can't alloc apple descriptor\n");
|
||||
@@ -1173,27 +1176,31 @@ static const struct hid_device_id apple_devices[] = {
|
||||
@@ -1174,27 +1177,31 @@ static const struct hid_device_id apple_devices[] = {
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING9_JIS),
|
||||
.driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRINGT2_J140K),
|
||||
|
||||
@ -15,7 +15,7 @@ diff --git a/drivers/gpu/drm/i915/display/intel_fbdev.c b/drivers/gpu/drm/i915/d
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/gpu/drm/i915/display/intel_fbdev.c
|
||||
+++ b/drivers/gpu/drm/i915/display/intel_fbdev.c
|
||||
@@ -224,10 +224,10 @@ int intel_fbdev_driver_fbdev_probe(struct drm_fb_helper *helper,
|
||||
@@ -253,10 +253,10 @@ int intel_fbdev_driver_fbdev_probe(struct drm_fb_helper *helper,
|
||||
ifbdev->fb = NULL;
|
||||
|
||||
if (fb &&
|
||||
|
||||
Loading…
Reference in New Issue
Block a user