From 48a07d81e7ff7296294a454846ac066512bc52fd Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Wed, 19 Dec 2012 15:42:26 -0700
Subject: [PATCH] --- yaml --- r: 353940 b: refs/heads/master c:
 74120719a70c984e04c16afe53dbdea868bed6da h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 3377239a6cdd..b24c750c1da7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bc252fd12c9430a011497d3726fad47683d58dc0
+refs/heads/master: 74120719a70c984e04c16afe53dbdea868bed6da
diff --git a/trunk/drivers/staging/comedi/comedi_fops.c b/trunk/drivers/staging/comedi/comedi_fops.c
index bc45c12e84d2..0161f94cd759 100644
--- a/trunk/drivers/staging/comedi/comedi_fops.c
+++ b/trunk/drivers/staging/comedi/comedi_fops.c
@@ -363,6 +363,18 @@ static void comedi_set_subdevice_runflags(struct comedi_subdevice *s,
 	spin_unlock_irqrestore(&s->spin_lock, flags);
 }
 
+unsigned comedi_get_subdevice_runflags(struct comedi_subdevice *s)
+{
+	unsigned long flags;
+	unsigned runflags;
+
+	spin_lock_irqsave(&s->spin_lock, flags);
+	runflags = s->runflags;
+	spin_unlock_irqrestore(&s->spin_lock, flags);
+	return runflags;
+}
+EXPORT_SYMBOL(comedi_get_subdevice_runflags);
+
 /*
    This function restores a subdevice to an idle state.
  */
@@ -2242,18 +2254,6 @@ void comedi_event(struct comedi_device *dev, struct comedi_subdevice *s)
 }
 EXPORT_SYMBOL(comedi_event);
 
-unsigned comedi_get_subdevice_runflags(struct comedi_subdevice *s)
-{
-	unsigned long flags;
-	unsigned runflags;
-
-	spin_lock_irqsave(&s->spin_lock, flags);
-	runflags = s->runflags;
-	spin_unlock_irqrestore(&s->spin_lock, flags);
-	return runflags;
-}
-EXPORT_SYMBOL(comedi_get_subdevice_runflags);
-
 static void comedi_device_init(struct comedi_device *dev)
 {
 	memset(dev, 0, sizeof(*dev));