diff --git a/[refs] b/[refs]
index b2ba584bd533..a397b92a73ad 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 305a6f3896350bbfa59c0021f59600bbbb2e9590
+refs/heads/master: a8f40f463fda58b90206173be73dc199beb7395f
diff --git a/trunk/drivers/staging/comedi/comedi_buf.c b/trunk/drivers/staging/comedi/comedi_buf.c
index 7d516a07474b..9d11f4163984 100644
--- a/trunk/drivers/staging/comedi/comedi_buf.c
+++ b/trunk/drivers/staging/comedi/comedi_buf.c
@@ -215,13 +215,6 @@ static unsigned int comedi_buf_munge(struct comedi_async *async,
 			int block_size = num_bytes - count;
 			unsigned int buf_end;
 
-			if (block_size < 0) {
-				dev_warn(s->device->class_dev,
-					"%s: %s: bug! block_size is negative\n",
-					__FILE__, __func__);
-				break;
-			}
-
 			buf_end = async->prealloc_bufsz - async->munge_ptr;
 			if (block_size > buf_end)
 				block_size = buf_end;