diff --git a/[refs] b/[refs]
index 942209f17425..e1ea4d869218 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 668f272e57e80ece987bed273096f8e3a707123c
+refs/heads/master: c5da20905c8ce21a73a9b443e5d7ef0dc623cff0
diff --git a/trunk/drivers/staging/comedi/drivers/serial2002.c b/trunk/drivers/staging/comedi/drivers/serial2002.c
index c929f986118c..5886ebfd043a 100644
--- a/trunk/drivers/staging/comedi/drivers/serial2002.c
+++ b/trunk/drivers/staging/comedi/drivers/serial2002.c
@@ -444,7 +444,7 @@ static int serial_2002_open(struct comedi_device *dev)
 				break;
 			} else {
 				int command, channel, kind;
-				struct config_t *cur_config = 0;
+				struct config_t *cur_config = NULL;
 
 				channel = data.value & 0x1f;
 				kind = (data.value >> 5) & 0x7;
@@ -571,8 +571,8 @@ static int serial_2002_open(struct comedi_device *dev)
 		for (i = 0; i <= 4; i++) {
 			/*  Fill in subdev data */
 			struct config_t *c;
-			unsigned char *mapping = 0;
-			struct serial2002_range_table_t *range = 0;
+			unsigned char *mapping = NULL;
+			struct serial2002_range_table_t *range = NULL;
 			int kind = 0;
 
 			switch (i) {
@@ -610,7 +610,7 @@ static int serial_2002_open(struct comedi_device *dev)
 				}
 				break;
 			default:{
-					c = 0;
+					c = NULL;
 				}
 				break;
 			}