mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-22 23:12:32 +00:00
dc2841045d
Add kernel tags to the patches that got accepted upstream.
Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit 2388b119de)
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
39 lines
1.5 KiB
Diff
39 lines
1.5 KiB
Diff
From 19098934f910b4d47cb30251dd39ffa57bef9523 Mon Sep 17 00:00:00 2001
|
|
From: John Thomson <git@johnthomson.fastmail.com.au>
|
|
Date: Tue, 6 Dec 2022 06:46:45 +1000
|
|
Subject: [PATCH] PCI: mt7621: Add sentinel to quirks table
|
|
|
|
Current driver is missing a sentinel in the struct soc_device_attribute
|
|
array, which causes an oops when assessed by the
|
|
soc_device_match(mt7621_pcie_quirks_match) call.
|
|
|
|
This was only exposed once the CONFIG_SOC_MT7621 mt7621 soc_dev_attr
|
|
was fixed to register the SOC as a device, in:
|
|
|
|
commit 7c18b64bba3b ("mips: ralink: mt7621: do not use kzalloc too early")
|
|
|
|
Fix it by adding the required sentinel.
|
|
|
|
Link: https://lore.kernel.org/lkml/26ebbed1-0fe9-4af9-8466-65f841d0b382@app.fastmail.com
|
|
Link: https://lore.kernel.org/r/20221205204645.301301-1-git@johnthomson.fastmail.com.au
|
|
Fixes: b483b4e4d3f6 ("staging: mt7621-pci: add quirks for 'E2' revision using 'soc_device_attribute'")
|
|
Signed-off-by: John Thomson <git@johnthomson.fastmail.com.au>
|
|
Signed-off-by: Lorenzo Pieralisi <lpieralisi@kernel.org>
|
|
Acked-by: Sergio Paracuellos <sergio.paracuellos@gmail.com>
|
|
---
|
|
drivers/pci/controller/pcie-mt7621.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/pci/controller/pcie-mt7621.c
|
|
+++ b/drivers/pci/controller/pcie-mt7621.c
|
|
@@ -471,7 +471,8 @@ static int mt7621_pcie_register_host(str
|
|
}
|
|
|
|
static const struct soc_device_attribute mt7621_pcie_quirks_match[] = {
|
|
- { .soc_id = "mt7621", .revision = "E2" }
|
|
+ { .soc_id = "mt7621", .revision = "E2" },
|
|
+ { /* sentinel */ }
|
|
};
|
|
|
|
static int mt7621_pcie_probe(struct platform_device *pdev)
|