diff --git a/[refs] b/[refs]
index a54fd1fa319b..f1db175fac89 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b48ad330d56a6cce7897132d9cb68cc2f19358e8
+refs/heads/master: 464c94514c703bc61c3f85db397582aa8f17cf9d
diff --git a/trunk/drivers/staging/comedi/drivers/ni_670x.c b/trunk/drivers/staging/comedi/drivers/ni_670x.c
index c9c72c51f323..bab964477118 100644
--- a/trunk/drivers/staging/comedi/drivers/ni_670x.c
+++ b/trunk/drivers/staging/comedi/drivers/ni_670x.c
@@ -295,7 +295,7 @@ static int ni_670x_attach(struct comedi_device *dev,
 	dev_info(dev->class_dev, "%s: %s attached\n",
 		dev->driver->driver_name, dev->board_name);
 
-	return 1;
+	return 0;
 }
 
 static void ni_670x_detach(struct comedi_device *dev)