mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
Merge 5.4.172 into android11-5.4-lts
Changes in 5.4.172
workqueue: Fix unbind_workers() VS wq_worker_running() race
Bluetooth: btusb: fix memory leak in btusb_mtk_submit_wmt_recv_urb()
Bluetooth: bfusb: fix division by zero in send path
USB: core: Fix bug in resuming hub's handling of wakeup requests
USB: Fix "slab-out-of-bounds Write" bug in usb_hcd_poll_rh_status
mmc: sdhci-pci: Add PCI ID for Intel ADL
veth: Do not record rx queue hint in veth_xmit
mfd: intel-lpss: Fix too early PM enablement in the ACPI ->probe()
drivers core: Use sysfs_emit and sysfs_emit_at for show(device *...) functions
can: gs_usb: fix use of uninitialized variable, detach device on reception of invalid USB data
can: gs_usb: gs_can_start_xmit(): zero-initialize hf->{flags,reserved}
random: fix data race on crng_node_pool
random: fix data race on crng init time
random: fix crash on multiple early calls to add_bootloader_randomness()
media: Revert "media: uvcvideo: Set unique vdev name based in type"
staging: wlan-ng: Avoid bitwise vs logical OR warning in hfa384x_usb_throttlefn()
drm/i915: Avoid bitwise vs logical OR warning in snb_wm_latency_quirk()
staging: greybus: fix stack size warning with UBSAN
Linux 5.4.172
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Change-Id: I66938f5222e1c76352f288ed8e13ee9221071530
This commit is contained in:
commit
1b6f3f2708
27 changed files with 265 additions and 221 deletions
|
|
@ -102,6 +102,7 @@ static int intel_lpss_acpi_probe(struct platform_device *pdev)
|
|||
{
|
||||
struct intel_lpss_platform_info *info;
|
||||
const struct acpi_device_id *id;
|
||||
int ret;
|
||||
|
||||
id = acpi_match_device(intel_lpss_acpi_ids, &pdev->dev);
|
||||
if (!id)
|
||||
|
|
@ -115,10 +116,14 @@ static int intel_lpss_acpi_probe(struct platform_device *pdev)
|
|||
info->mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
info->irq = platform_get_irq(pdev, 0);
|
||||
|
||||
ret = intel_lpss_probe(&pdev->dev, info);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
pm_runtime_set_active(&pdev->dev);
|
||||
pm_runtime_enable(&pdev->dev);
|
||||
|
||||
return intel_lpss_probe(&pdev->dev, info);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int intel_lpss_acpi_remove(struct platform_device *pdev)
|
||||
|
|
|
|||
Loading…
Reference in a new issue