diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/pcmcia/rsrc_nonstatic.c | 2 | ||||
| -rw-r--r-- | drivers/pcmcia/soc_common.c | 8 |
2 files changed, 7 insertions, 3 deletions
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++) { |