Merge 3.15-rc2 into staging-next

[firefly-linux-kernel-4.4.55.git] / drivers / staging / goldfish / goldfish_audio.c

diff --git a/drivers/staging/goldfish/goldfish_audio.c b/drivers/staging/goldfish/goldfish_audio.c
index 7ac2602242f1f4e6527025b0b2566b52e01687f3..9243845418d64f61656f14716c5e79fd13ea3bff 100644 (file)
--- a/drivers/staging/goldfish/goldfish_audio.c
+++ b/drivers/staging/goldfish/goldfish_audio.c
@@ -147,6 +147,7 @@ static ssize_t goldfish_audio_write(struct file *fp, const char __user *buf,
 
        while (count > 0) {
                ssize_t copy = count;
+
                if (copy > WRITE_BUFFER_SIZE)
                        copy = WRITE_BUFFER_SIZE;
                wait_event_interruptible(data->wait, (data->buffer_status &