From 6fb3c2bd693b2e138ebed0cdfdb2b74a495d9be2 Mon Sep 17 00:00:00 2001 From: Dylan Socolobsky Date: Mon, 13 May 2013 19:42:28 -0300 Subject: [PATCH] Staging: ft1000: fix brace coding style in ft1000_dnld.c This simple patch fixes a brace warning raised by checkpatch.pl in ft1000_dnld.c Signed-off-by: Dylan Socolobsky Signed-off-by: Greg Kroah-Hartman --- drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c index 47cc365c630b..18a8751065e6 100644 --- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c +++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c @@ -133,9 +133,9 @@ void card_bootload(struct net_device *dev) size = sizeof(bootimage); // check for odd word - if (size & 0x0003) { + if (size & 0x0003) size += 4; - } + // Provide mutual exclusive access while reading ASIC registers. spin_lock_irqsave(&info->dpram_lock, flags); @@ -345,11 +345,10 @@ int card_download(struct net_device *dev, const u8 *pFileStart, handshake = get_handshake(dev, HANDSHAKE_DSP_BL_READY); - if (handshake == HANDSHAKE_DSP_BL_READY) { + if (handshake == HANDSHAKE_DSP_BL_READY) put_handshake(dev, HANDSHAKE_DRIVER_READY); - } else { + else Status = FAILURE; - } uiState = STATE_BOOT_DWNLD; @@ -538,9 +537,9 @@ int card_download(struct net_device *dev, const u8 *pFileStart, outw(DWNLD_MAG_PS_HDR_LOC, dev->base_addr + FT1000_REG_DPRAM_ADDR); - if (word_length & 0x01) { + if (word_length & 0x01) word_length++; - } + word_length = word_length / 2; for (; word_length > 0; word_length--) { /* In words */ -- 2.34.1