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

diff --git a/MAINTAINERS b/MAINTAINERS
index cf42583385870061ab93bc91a1f9b51fc97b7c3f..4c7a2fdc9b34314a863c77e9fc1fefbf0a626d03 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -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/

diff --git a/drivers/pcmcia/rsrc_nonstatic.c b/drivers/pcmcia/rsrc_nonstatic.c
index 5ef7b46a25786b30f214dfc5a2e93cbc07f79eea..49377d502b740da7381b718cd7589c87789fb609 100644 (file)
--- a/drivers/pcmcia/rsrc_nonstatic.c
+++ b/drivers/pcmcia/rsrc_nonstatic.c
@@ -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);

diff --git a/drivers/pcmcia/soc_common.c b/drivers/pcmcia/soc_common.c
index 764650eb8897995a55ccc7dc3aaf20c210b53199..c5f2344c189badcea4f92dbbf4bf497dd2d64796 100644 (file)
--- a/drivers/pcmcia/soc_common.c
+++ b/drivers/pcmcia/soc_common.c
@@ -191,12 +191,16 @@ 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++) {