From 1c8a73c1d1c989c16c78d2658fc83b049db1461f Mon Sep 17 00:00:00 2001
From: Pieter De Praetere <pieterc.depraetere@ugent.be>
Date: Wed, 10 Mar 2010 09:47:44 +0100
Subject: [PATCH] --- yaml --- r: 196939 b: refs/heads/master c:
 20617f22b006e12b81602d80d85f8f3f7efdef45 h: refs/heads/master i:   196937:
 fc8bcee6b83d85e66c009e0e75503c5de342cee9   196935:
 02cf89d38e0d41d0a465b70c38feae0c24953c7f v: v3

---
 [refs]                                     |  2 +-
 trunk/drivers/staging/comedi/comedi_fops.c | 39 +++++++++++-----------
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/[refs] b/[refs]
index cb1b391a19ce..5b3e6d4a90dc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2306d9b1ee065d0dfb56af4cd05195ec61d69256
+refs/heads/master: 20617f22b006e12b81602d80d85f8f3f7efdef45
diff --git a/trunk/drivers/staging/comedi/comedi_fops.c b/trunk/drivers/staging/comedi/comedi_fops.c
index aca96747e5e2..287a1af3d013 100644
--- a/trunk/drivers/staging/comedi/comedi_fops.c
+++ b/trunk/drivers/staging/comedi/comedi_fops.c
@@ -598,19 +598,19 @@ static int do_bufinfo_ioctl(struct comedi_device *dev, void *arg)
 static int parse_insn(struct comedi_device *dev, struct comedi_insn *insn,
 		      unsigned int *data, void *file);
 /*
- * 	COMEDI_INSNLIST
- * 	synchronous instructions
+ *	COMEDI_INSNLIST
+ *	synchronous instructions
  *
- * 	arg:
- * 		pointer to sync cmd structure
+ *	arg:
+ *		pointer to sync cmd structure
  *
- * 	reads:
- * 		sync cmd struct at arg
- * 		instruction list
- * 		data (for writes)
+ *	reads:
+ *		sync cmd struct at arg
+ *		instruction list
+ *		data (for writes)
  *
- * 	writes:
- * 		data (for reads)
+ *	writes:
+ *		data (for reads)
  */
 /* arbitrary limits */
 #define MAX_SAMPLES 256
@@ -894,18 +894,18 @@ static int parse_insn(struct comedi_device *dev, struct comedi_insn *insn,
 }
 
 /*
- * 	COMEDI_INSN
- * 	synchronous instructions
+ *	COMEDI_INSN
+ *	synchronous instructions
  *
- * 	arg:
- * 		pointer to insn
+ *	arg:
+ *		pointer to insn
  *
- * 	reads:
- * 		struct comedi_insn struct at arg
- * 		data (for writes)
+ *	reads:
+ *		struct comedi_insn struct at arg
+ *		data (for writes)
  *
- * 	writes:
- * 		data (for reads)
+ *	writes:
+ *		data (for reads)
  */
 static int do_insn_ioctl(struct comedi_device *dev, void *arg, void *file)
 {
@@ -2105,6 +2105,7 @@ int comedi_alloc_board_minor(struct device *hardware_device)
 		kfree(info->device);
 		kfree(info);
 		printk(KERN_ERR
+
 		       "comedi: error: ran out of minor numbers for board device files.\n");
 		return -EBUSY;
 	}