diff --git a/[refs] b/[refs]
index ce403ed9e677..5e769791986b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6dcbe00df71bd0559c32ef7e838eac1458ad24d6
+refs/heads/master: 66dbc7b1b00499285793143b44b979e26141204d
diff --git a/trunk/drivers/staging/comedi/drivers/vmk80xx.c b/trunk/drivers/staging/comedi/drivers/vmk80xx.c
index d0ff0e7b119d..ebf2d4824860 100644
--- a/trunk/drivers/staging/comedi/drivers/vmk80xx.c
+++ b/trunk/drivers/staging/comedi/drivers/vmk80xx.c
@@ -1011,7 +1011,7 @@ static int vmk80xx_alloc_usb_buffers(struct comedi_device *dev)
 	return 0;
 }
 
-static int vmk80xx_attach_common(struct comedi_device *dev)
+static int vmk80xx_init_subdevices(struct comedi_device *dev)
 {
 	const struct vmk80xx_board *boardinfo = comedi_board(dev);
 	struct vmk80xx_private *devpriv = dev->private;
@@ -1151,7 +1151,7 @@ static int vmk80xx_auto_attach(struct comedi_device *dev,
 	if (devpriv->model == VMK8055_MODEL)
 		vmk80xx_reset_device(devpriv);
 
-	return vmk80xx_attach_common(dev);
+	return vmk80xx_init_subdevices(dev);
 }
 
 static void vmk80xx_detach(struct comedi_device *dev)