aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds2022-09-06 21:27:05 -0400
committerLinus Torvalds2022-09-06 21:27:05 -0400
commit19f516ea34f943edd5bfe9ca0c0050a7660c230c (patch)
tree00c8eb2bc5d0f8b43e0ab38eff0fd9a49479e7b5 /include
parentd2ec799d1c1be847d6a70704fe586ac4d14265c8 (diff)
parent25af7406df5915f04d5f1c8f081dabb0ead1cdcc (diff)
Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm
Pull ARM fix from Russell King: "Just one fix for now for the AMBA bus code from Isaac Manjarres" * tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm: ARM: 9229/1: amba: Fix use-after-free in amba_read_periphid()
Diffstat (limited to 'include')
-rw-r--r--include/linux/amba/bus.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/amba/bus.h b/include/linux/amba/bus.h
index e94cdf235f1d..5001e14c5c06 100644
--- a/include/linux/amba/bus.h
+++ b/include/linux/amba/bus.h
@@ -67,6 +67,7 @@ struct amba_device {
struct clk *pclk;
struct device_dma_parameters dma_parms;
unsigned int periphid;
+ struct mutex periphid_lock;
unsigned int cid;
struct amba_cs_uci_id uci;
unsigned int irq[AMBA_NR_IRQS];