diff --git a/patch/kernel/archive/odroidxu4-6.6/patch-6.6.116-117.patch b/patch/kernel/archive/odroidxu4-6.6/patch-6.6.116-117-fixed.patch similarity index 99% rename from patch/kernel/archive/odroidxu4-6.6/patch-6.6.116-117.patch rename to patch/kernel/archive/odroidxu4-6.6/patch-6.6.116-117-fixed.patch index 092d64e1a3..c9c5f569ab 100644 --- a/patch/kernel/archive/odroidxu4-6.6/patch-6.6.116-117.patch +++ b/patch/kernel/archive/odroidxu4-6.6/patch-6.6.116-117-fixed.patch @@ -8395,45 +8395,6 @@ index d62a776c89a121..e592f819c8fa07 100644 { .compatible = "apple,pmgr-pwrstate" }, {} }; -diff --git a/drivers/pmdomain/samsung/exynos-pm-domains.c b/drivers/pmdomain/samsung/exynos-pm-domains.c -index 9b502e8751d18c..0f065748f9ec07 100644 ---- a/drivers/pmdomain/samsung/exynos-pm-domains.c -+++ b/drivers/pmdomain/samsung/exynos-pm-domains.c -@@ -92,13 +92,14 @@ static const struct of_device_id exynos_pm_domain_of_match[] = { - { }, - }; - --static const char *exynos_get_domain_name(struct device_node *node) -+static const char *exynos_get_domain_name(struct device *dev, -+ struct device_node *node) - { - const char *name; - - if (of_property_read_string(node, "label", &name) < 0) - name = kbasename(node->full_name); -- return kstrdup_const(name, GFP_KERNEL); -+ return devm_kstrdup_const(dev, name, GFP_KERNEL); - } - - static int exynos_pd_probe(struct platform_device *pdev) -@@ -115,15 +116,13 @@ static int exynos_pd_probe(struct platform_device *pdev) - if (!pd) - return -ENOMEM; - -- pd->pd.name = exynos_get_domain_name(np); -+ pd->pd.name = exynos_get_domain_name(dev, np); - if (!pd->pd.name) - return -ENOMEM; - - pd->base = of_iomap(np, 0); -- if (!pd->base) { -- kfree_const(pd->pd.name); -+ if (!pd->base) - return -ENODEV; -- } - - pd->pd.power_off = exynos_pd_power_off; - pd->pd.power_on = exynos_pd_power_on; diff --git a/drivers/power/supply/qcom_battmgr.c b/drivers/power/supply/qcom_battmgr.c index 190e8a4cfa97f4..0c993780d3ef29 100644 --- a/drivers/power/supply/qcom_battmgr.c diff --git a/patch/kernel/archive/odroidxu4-6.6/patch-6.6.117-118.patch b/patch/kernel/archive/odroidxu4-6.6/patch-6.6.117-118-fixed.patch similarity index 99% rename from patch/kernel/archive/odroidxu4-6.6/patch-6.6.117-118.patch rename to patch/kernel/archive/odroidxu4-6.6/patch-6.6.117-118-fixed.patch index fb1f620749..6e51fdc3cf 100644 --- a/patch/kernel/archive/odroidxu4-6.6/patch-6.6.117-118.patch +++ b/patch/kernel/archive/odroidxu4-6.6/patch-6.6.117-118-fixed.patch @@ -530,9 +530,9 @@ index 75480ec3c15a2d..fa946666969b8d 100644 { HID_USB_DEVICE(USB_VENDOR_ID_YEALINK, USB_DEVICE_ID_YEALINK_P1K_P4K_B2K) }, { HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_HP_5MP_CAMERA_5473) }, - { HID_USB_DEVICE(USB_VENDOR_ID_SMARTLINKTECHNOLOGY, USB_DEVICE_ID_SMARTLINKTECHNOLOGY_4155) }, - { } - }; - + { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_MULTITOUCH) }, + { HID_USB_DEVICE(USB_VENDOR_ID_ODROID, USB_DEVICE_ID_VU5) }, + { HID_USB_DEVICE(USB_VENDOR_ID_ODROID, USB_DEVICE_ID_VU7PLUS) }, @@ -1057,6 +1056,18 @@ bool hid_ignore(struct hid_device *hdev) strlen(elan_acpi_id[i].id))) return true;