diff --git a/[refs] b/[refs]
index f69c25ce993a..8ea7fa285b75 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9682e28c49f85d4a3c5d2cab401d03ae266f6dde
+refs/heads/master: 401d99de5c0b70f7d64a410ed01d19032698656c
diff --git a/trunk/drivers/staging/comedi/comedi_fops.c b/trunk/drivers/staging/comedi/comedi_fops.c
index 33f5187e49db..8d407ccd4ed4 100644
--- a/trunk/drivers/staging/comedi/comedi_fops.c
+++ b/trunk/drivers/staging/comedi/comedi_fops.c
@@ -118,9 +118,9 @@ comedi_read_subdevice(const struct comedi_file_info *info)
 {
 	if (info->read_subdevice)
 		return info->read_subdevice;
-	if (info->device == NULL)
-		return NULL;
-	return info->device->read_subdev;
+	if (info->device)
+		return info->device->read_subdev;
+	return NULL;
 }
 
 static struct comedi_subdevice *
@@ -128,9 +128,9 @@ comedi_write_subdevice(const struct comedi_file_info *info)
 {
 	if (info->write_subdevice)
 		return info->write_subdevice;
-	if (info->device == NULL)
-		return NULL;
-	return info->device->write_subdev;
+	if (info->device)
+		return info->device->write_subdev;
+	return NULL;
 }
 
 static int resize_async_buffer(struct comedi_device *dev,