openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

mvebu soc for 4.11 (part 1) 

Cleanup up on dove pmu and mv78x00 pci
 -----BEGIN PGP SIGNATURE-----
 
 iIEEABECAEEWIQQYqXDMF3cvSLY+g9cLBhiOFHI71QUCWIt76SMcZ3JlZ29yeS5j
 bGVtZW50QGZyZWUtZWxlY3Ryb25zLmNvbQAKCRALBhiOFHI71ei+AKCfHdyZYwW1
 uRXvVqdkSgOYQ8hAiwCfd2NeIfkr/7rEufrswNvqcmVc078=
 =FdKA
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Olof Johansson 2017-01-29 21:01:52 -08:00
parent faff11d1bc f2591b993e
commit 0cc7d0a6ea
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-mv78xx0/pcie.c
View File

@ -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;
};

2
drivers/soc/dove/pmu.c
View File

@ -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,