Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 605dc776 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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
parents fe26adf4 d3fdd701

MAINTAINERS

+2 −4
Original line number Diff line number Diff line
@@ -10799,11 +10799,9 @@ S: Maintained 
F:	drivers/pci/dwc/*spear*



PCMCIA SUBSYSTEM

P:	Linux PCMCIA Team

L:	linux-pcmcia@lists.infradead.org

W:	http://lists.infradead.org/mailman/listinfo/linux-pcmcia

M:	Dominik Brodowski <linux@dominikbrodowski.net>

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia.git

S:	Maintained

S:	Odd Fixes

F:	Documentation/pcmcia/

F:	tools/pcmcia/

F:	drivers/pcmcia/

drivers/pcmcia/rsrc_nonstatic.c

+1 −1
Original line number Diff line number Diff line
@@ -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);



	free_region(res2);

drivers/pcmcia/soc_common.c

+6 −2
Original line number Diff line number Diff line
@@ -191,13 +191,17 @@ static int soc_pcmcia_hw_init(struct soc_pcmcia_socket *skt) 
{

	int ret = 0, i;



	clk_prepare_enable(skt->clk);

	ret = clk_prepare_enable(skt->clk);

	if (ret)

		return ret;



	if (skt->ops->hw_init) {

		ret = skt->ops->hw_init(skt);

		if (ret)

		if (ret) {

			clk_disable_unprepare(skt->clk);

			return ret;

		}

	}



	for (i = 0; i < ARRAY_SIZE(skt->stat); i++) {

		if (gpio_is_valid(skt->stat[i].gpio)) {