diff --git a/[refs] b/[refs]
index a397b92a73ad..1337e56f7c7d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a8f40f463fda58b90206173be73dc199beb7395f
+refs/heads/master: 6166ce878771edfe2d0fb9e719d5c4d4d4b82157
diff --git a/trunk/drivers/staging/comedi/comedi_buf.c b/trunk/drivers/staging/comedi/comedi_buf.c
index 9d11f4163984..17162d94273b 100644
--- a/trunk/drivers/staging/comedi/comedi_buf.c
+++ b/trunk/drivers/staging/comedi/comedi_buf.c
@@ -252,11 +252,9 @@ unsigned int comedi_buf_write_free(struct comedi_async *async,
 {
 	unsigned int allocated = comedi_buf_write_n_allocated(async);
 
-	if (nbytes > allocated) {
-		dev_info(async->subdevice->device->class_dev,
-			 "attempted to write-free more bytes than have been write-allocated.\n");
+	if (nbytes > allocated)
 		nbytes = allocated;
-	}
+
 	async->buf_write_count += nbytes;
 	async->buf_write_ptr += nbytes;
 	comedi_buf_munge(async, async->buf_write_count - async->munge_count);