Merge 3.16-rc4 into staging-next

[karo-tx-linux.git] / drivers / staging / tidspbridge / core / tiomap3430.c

diff --git a/drivers/staging/tidspbridge/core/tiomap3430.c b/drivers/staging/tidspbridge/core/tiomap3430.c
index cb50120ed7b59a1ba531e649e6cbfeef85565f11..f63dd8f4dde9c0504d18888fa59ed085bfd62d23 100644 (file)
--- a/drivers/staging/tidspbridge/core/tiomap3430.c
+++ b/drivers/staging/tidspbridge/core/tiomap3430.c
@@ -1059,6 +1059,7 @@ static int bridge_brd_mem_copy(struct bridge_dev_context *dev_ctxt,
        u32 total_bytes = ul_num_bytes;
        u8 host_buf[BUFFERSIZE];
        struct bridge_dev_context *dev_context = dev_ctxt;
+
        while (total_bytes > 0 && !status) {
                copy_bytes =
                    total_bytes > BUFFERSIZE ? BUFFERSIZE : total_bytes;
@@ -1096,6 +1097,7 @@ static int bridge_brd_mem_write(struct bridge_dev_context *dev_ctxt,
        struct bridge_dev_context *dev_context = dev_ctxt;
        u32 ul_remain_bytes = 0;
        u32 ul_bytes = 0;
+
        ul_remain_bytes = ul_num_bytes;
        while (ul_remain_bytes > 0 && !status) {
                ul_bytes =