diff --git a/[refs] b/[refs]
index 056e1ed7faf1..b2ba584bd533 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8ae560a14abaf2b76fb486ad08fea9c6c5be640f
+refs/heads/master: 305a6f3896350bbfa59c0021f59600bbbb2e9590
diff --git a/trunk/drivers/staging/comedi/comedi_buf.c b/trunk/drivers/staging/comedi/comedi_buf.c
index ac5f0a91e93b..7d516a07474b 100644
--- a/trunk/drivers/staging/comedi/comedi_buf.c
+++ b/trunk/drivers/staging/comedi/comedi_buf.c
@@ -245,7 +245,6 @@ static unsigned int comedi_buf_munge(struct comedi_async *async,
 		}
 	}
 
-	BUG_ON((int)(async->munge_count - async->buf_write_count) > 0);
 	return count;
 }