Emulation/switch-linux
1
0
Fork 0
mirror of https://github.com/fail0verflow/switch-linux.git synced 2025-05-04 02:34:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'pcmcia' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia

Browse source 
Pull pcmcia updates from Dominik Brodowski:
 "The linux-pcmcia mailing list was shut down, so offer an alternative
  path for patches in MAINTAINERS.

  Also, throw in two odd fixes for the pcmcia subsystem"

* 'pcmcia' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia:
  pcmcia: soc_common: Handle return value of clk_prepare_enable
  pcmcia: use proper printk format for resource
  pcmcia: remove mailing list, update MAINTAINERS
This commit is contained in:
Linus Torvalds 2018-02-08 11:48:49 -08:00
commit 605dc7761d
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
MAINTAINERS
View file

@ -10799,11 +10799,9 @@ S: Maintained
F: drivers/pci/dwc/*spear* F: drivers/pci/dwc/*spear*
PCMCIA SUBSYSTEM PCMCIA SUBSYSTEM
P: Linux PCMCIA Team M: Dominik Brodowski <linux@dominikbrodowski.net>
L: linux-pcmcia@lists.infradead.org
W: http://lists.infradead.org/mailman/listinfo/linux-pcmcia
T: git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia.git T: git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia.git
S: Maintained S: Odd Fixes
F: Documentation/pcmcia/ F: Documentation/pcmcia/
F: tools/pcmcia/ F: tools/pcmcia/
F: drivers/pcmcia/ F: drivers/pcmcia/

2
drivers/pcmcia/rsrc_nonstatic.c
View file

@ -367,7 +367,7 @@ static int do_validate_mem(struct pcmcia_socket *s,
} }
} }
dev_dbg(&s->dev, "cs: memory probe 0x%06lx-0x%06lx: %p %p %u %u %u", dev_dbg(&s->dev, "cs: memory probe 0x%06lx-0x%06lx: %pr %pr %u %u %u",
base, base+size-1, res1, res2, ret, info1, info2); base, base+size-1, res1, res2, ret, info1, info2);
free_region(res2); free_region(res2);

8
drivers/pcmcia/soc_common.c
View file

@ -191,13 +191,17 @@ static int soc_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
{ {
int ret = 0, i; int ret = 0, i;
clk_prepare_enable(skt->clk); ret = clk_prepare_enable(skt->clk);
if (ret)
return ret;
if (skt->ops->hw_init) { if (skt->ops->hw_init) {
ret = skt->ops->hw_init(skt); ret = skt->ops->hw_init(skt);
if (ret) if (ret) {
clk_disable_unprepare(skt->clk);
return ret; return ret;
} }
}
for (i = 0; i < ARRAY_SIZE(skt->stat); i++) { for (i = 0; i < ARRAY_SIZE(skt->stat); i++) {
if (gpio_is_valid(skt->stat[i].gpio)) { if (gpio_is_valid(skt->stat[i].gpio)) {