diff options
| author |   Olof Johansson <olof@lixom.net> | 2017-01-29 21:01:52 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-01-29 21:01:52 -0800 |
| commit | 0cc7d0a6eadf65e5d51ead251c73586260558a57 (patch) | |
| tree | 8c326c10cc7b3a6c59fb61603c6017c5e4645c6c | |
| parent | Merge tag 'tegra-for-4.11-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/soc (diff) | |
| parent | soc: dove: constify reset_control_ops structures (diff) | |
| download | wireguard-linux-0cc7d0a6eadf65e5d51ead251c73586260558a57.tar.xz wireguard-linux-0cc7d0a6eadf65e5d51ead251c73586260558a57.zip | |
Merge tag 'mvebu-soc-4.11-1' of git://git.infradead.org/linux-mvebu into next/soc
mvebu soc for 4.11 (part 1)
Cleanup up on dove pmu and mv78x00 pci
* tag 'mvebu-soc-4.11-1' of git://git.infradead.org/linux-mvebu:
soc: dove: constify reset_control_ops structures
ARM: mv78xx0: fix possible PCI buffer overflow
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | arch/arm/mach-mv78xx0/pcie.c | 2 | ||||
| -rw-r--r-- | drivers/soc/dove/pmu.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-mv78xx0/pcie.c b/arch/arm/mach-mv78xx0/pcie.c index 13a7d72ee0c4..81ff4327a962 100644 --- a/arch/arm/mach-mv78xx0/pcie.c +++ b/arch/arm/mach-mv78xx0/pcie.c @@ -29,7 +29,7 @@ struct pcie_port { u8 root_bus_nr; void __iomem *base; spinlock_t conf_lock; - char mem_space_name[16]; + char mem_space_name[20]; struct resource res; }; diff --git a/drivers/soc/dove/pmu.c b/drivers/soc/dove/pmu.c index 039374e9fdc0..95d77ec5c5d7 100644 --- a/drivers/soc/dove/pmu.c +++ b/drivers/soc/dove/pmu.c @@ -87,7 +87,7 @@ static int pmu_reset_deassert(struct reset_controller_dev *rc, unsigned long id) return 0; } -static struct reset_control_ops pmu_reset_ops = { +static const struct reset_control_ops pmu_reset_ops = { .reset = pmu_reset_reset, .assert = pmu_reset_assert, .deassert = pmu_reset_deassert, |