From af87fae7c1cd9c3f1caf8e3f12067c5a951280b0 Mon Sep 17 00:00:00 2001 From: Dominik Brodowski Date: Mon, 22 Jan 2018 21:31:43 +0100 Subject: pcmcia: remove mailing list, update MAINTAINERS In recent years, the linux-pcmcia mailing list gained a pretty bad signal-to-noise ratio. It does not seem worth the hassle to keep it any longer. Thanks to David for hosting the list for the last couple of years! Acked-by: David Woodhouse CC: Russell King Signed-off-by: Dominik Brodowski --- MAINTAINERS | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index e3581413420c..3dc821ddfc6b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -10641,11 +10641,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 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/ -- cgit v1.2.3 From 3490a69bdd815ab38230c993b3a6e02937237ac8 Mon Sep 17 00:00:00 2001 From: Dominik Brodowski Date: Mon, 22 Jan 2018 21:36:27 +0100 Subject: pcmcia: use proper printk format for resource Even though it is just in a dev_dbg statement, improve the printk format to use %pr instead of plain %p. Signed-off-by: Dominik Brodowski --- drivers/pcmcia/rsrc_nonstatic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); -- cgit v1.2.3 From d3fdd701248290b511683ff8d348073295f07833 Mon Sep 17 00:00:00 2001 From: Arvind Yadav Date: Thu, 1 Jun 2017 16:17:10 +0530 Subject: pcmcia: soc_common: Handle return value of clk_prepare_enable clk_prepare_enable() can fail here and we must check its return value. Signed-off-by: Arvind Yadav CC: Russell King Signed-off-by: Dominik Brodowski --- drivers/pcmcia/soc_common.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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++) { -- cgit v1.2.3