diff --git a/[refs] b/[refs]
index c759de4bb858..e7315ec4cf77 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9e4edd5794c94463bc0dfb0552cf6bba11b19bcc
+refs/heads/master: e45244b73f09b2b13044603c6647d14b15e692f2
diff --git a/trunk/drivers/staging/comedi/drivers/comedi_fc.c b/trunk/drivers/staging/comedi/drivers/comedi_fc.c
index 63be619dd606..83728298eefb 100644
--- a/trunk/drivers/staging/comedi/drivers/comedi_fc.c
+++ b/trunk/drivers/staging/comedi/drivers/comedi_fc.c
@@ -53,7 +53,7 @@ unsigned int cfc_write_array_to_buffer(struct comedi_subdevice *subd,
 
 	retval = comedi_buf_write_alloc(async, num_bytes);
 	if (retval != num_bytes) {
-		printk(KERN_WARNING "comedi: buffer overrun\n");
+		dev_warn(subd->device->class_dev, "comedi: buffer overrun\n");
 		async->events |= COMEDI_CB_OVERFLOW;
 		return 0;
 	}