]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
staging: xillybus: Added curly brackets as required
authorEli Billauer <eli.billauer@gmail.com>
Thu, 4 Sep 2014 14:47:51 +0000 (17:47 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 8 Sep 2014 20:58:19 +0000 (13:58 -0700)
Suggested-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Eli Billauer <eli.billauer@gmail.com>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/xillybus/xillybus_core.c
drivers/staging/xillybus/xillybus_pcie.c

index 1b63197843b717c7a50d2d3c674b2b3be450203c..0001d1892d44ebc2b68bdd629eb0580e0a168004 100644 (file)
@@ -141,7 +141,7 @@ irqreturn_t xillybus_isr(int irq, void *data)
                                      ep->msg_buf_size,
                                      DMA_FROM_DEVICE);
 
-       for (i = 0; i < buf_size; i += 2)
+       for (i = 0; i < buf_size; i += 2) {
                if (((buf[i+1] >> 28) & 0xf) != ep->msg_counter) {
                        malformed_message(ep, &buf[i]);
                        dev_warn(ep->dev,
@@ -166,6 +166,7 @@ irqreturn_t xillybus_isr(int irq, void *data)
                        return IRQ_HANDLED;
                } else if (buf[i] & (1 << 22)) /* Last message */
                        break;
+       }
 
        if (i >= buf_size) {
                dev_err(ep->dev, "Bad interrupt message. Stopping.\n");
@@ -1093,10 +1094,11 @@ static int xillybus_myflush(struct xilly_channel *channel, long timeout)
                           channel->endpoint->registers + fpga_buf_ctrl_reg);
 
                mutex_unlock(&channel->endpoint->register_mutex);
-       } else if (bufidx == 0)
+       } else if (bufidx == 0) {
                bufidx = channel->num_rd_buffers - 1;
-       else
+       } else {
                bufidx--;
+       }
 
        channel->rd_host_buf_pos = new_rd_host_buf_pos;
 
index 371cec318c481a9e3497f052798318ed58ccb31b..ec9b923fc1e237d5ad55febb501760f6af4199be 100644 (file)
@@ -199,9 +199,9 @@ static int xilly_probe(struct pci_dev *pdev,
         * nobody and use 32 bits DMA addressing in any case.
         */
 
-       if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(32)))
+       if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) {
                endpoint->dma_using_dac = 0;
-       else {
+       else {
                dev_err(endpoint->dev, "Failed to set DMA mask. Aborting.\n");
                return -ENODEV;
        }