Merge tag 's390-5.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[linux-2.6-microblaze.git] / drivers / staging / axis-fifo / axis-fifo.c

diff --git a/drivers/staging/axis-fifo/axis-fifo.c b/drivers/staging/axis-fifo/axis-fifo.c
index 5801067..2bb1c2e 100644 (file)
--- a/drivers/staging/axis-fifo/axis-fifo.c
+++ b/drivers/staging/axis-fifo/axis-fifo.c
@@ -383,8 +383,9 @@ static ssize_t axis_fifo_read(struct file *f, char __user *buf,
                mutex_lock(&fifo->read_lock);
                ret = wait_event_interruptible_timeout(fifo->read_queue,
                        ioread32(fifo->base_addr + XLLF_RDFO_OFFSET),
-                       (read_timeout >= 0) ? msecs_to_jiffies(read_timeout) :
-                               MAX_SCHEDULE_TIMEOUT);
+                                (read_timeout >= 0) ?
+                                 msecs_to_jiffies(read_timeout) :
+                                 MAX_SCHEDULE_TIMEOUT);
 
                if (ret <= 0) {
                        if (ret == 0) {
@@ -525,9 +526,10 @@ static ssize_t axis_fifo_write(struct file *f, const char __user *buf,
                mutex_lock(&fifo->write_lock);
                ret = wait_event_interruptible_timeout(fifo->write_queue,
                        ioread32(fifo->base_addr + XLLF_TDFV_OFFSET)
-                               >= words_to_write,
-                       (write_timeout >= 0) ? msecs_to_jiffies(write_timeout) :
-                               MAX_SCHEDULE_TIMEOUT);
+                                >= words_to_write,
+                                (write_timeout >= 0) ?
+                                 msecs_to_jiffies(write_timeout) :
+                                 MAX_SCHEDULE_TIMEOUT);
 
                if (ret <= 0) {
                        if (ret == 0) {