2008-10-30 11:03:19

by Ilpo Järvinen

Subject: [PATCH] pcmcia: fix indentation & braces disagreement - add braces

Broken by d8b0a49da4f2 (pcmcia: deprecate CS_BAD_VCC and
CS_BAD_VPP).

Signed-off-by: Ilpo J?rvinen <[email protected]>
Cc: Dominik Brodowski <[email protected]>
---
drivers/pcmcia/pcmcia_resource.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/pcmcia/pcmcia_resource.c b/drivers/pcmcia/pcmcia_resource.c
index afea2b2..e3b3139 100644
--- a/drivers/pcmcia/pcmcia_resource.c
+++ b/drivers/pcmcia/pcmcia_resource.c
@@ -302,9 +302,10 @@ int pcmcia_modify_configuration(struct pcmcia_device *p_dev,
/* We only allow changing Vpp1 and Vpp2 to the same value */
if ((mod->Attributes & CONF_VPP1_CHANGE_VALID) &&
(mod->Attributes & CONF_VPP2_CHANGE_VALID)) {
- if (mod->Vpp1 != mod->Vpp2)
+ if (mod->Vpp1 != mod->Vpp2) {
ds_dbg(s, 0, "Vpp1 and Vpp2 must be the same\n");
return -EINVAL;
+ }
s->socket.Vpp = mod->Vpp1;
if (s->ops->set_socket(s, &s->socket)) {
dev_printk(KERN_WARNING, &s->dev,
--
1.5.2.2

2008-11-02 13:37:44

by Dominik Brodowski

Subject: Re: [PATCH] pcmcia: fix indentation & braces disagreement - add braces

On Thu, Oct 30, 2008 at 01:02:54PM +0200, Ilpo J?rvinen wrote:
> Broken by d8b0a49da4f2 (pcmcia: deprecate CS_BAD_VCC and
> CS_BAD_VPP).

Applied, thanks!

Dominik