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

3 files changed, 9 insertions, 7 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index cf4258338587..4c7a2fdc9b34 100644
--- 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 5ef7b46a2578..49377d502b74 100644
--- 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 764650eb8897..c5f2344c189b 100644
--- 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++) {