From 480f5c6fbf3ac7da2daabfe403b4763793dda900 Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jarod@redhat.com>
Date: Mon, 9 May 2011 16:53:17 -0300
Subject: [PATCH] --- yaml --- r: 250307 b: refs/heads/master c:
 c812045488afbe3830843fc6686ae84bfc928a5f h: refs/heads/master i:   250305:
 5d02bb0e866494f6d55047491cf1118a68cc4f4d   250303:
 9ef628162d0d9d111fa5e8059e39bf49c25890b5 v: v3

---
 [refs]                           |  2 +-
 trunk/drivers/media/rc/ite-cir.c | 16 +++++++---------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 07ffdc8c6100..02feb1a109f3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f0c1629dca6ffd8b1b07654704ac56c5a63270e3
+refs/heads/master: c812045488afbe3830843fc6686ae84bfc928a5f
diff --git a/trunk/drivers/media/rc/ite-cir.c b/trunk/drivers/media/rc/ite-cir.c
index d1dec5c25324..e716b931cf7e 100644
--- a/trunk/drivers/media/rc/ite-cir.c
+++ b/trunk/drivers/media/rc/ite-cir.c
@@ -1650,6 +1650,9 @@ static int ite_suspend(struct pnp_dev *pdev, pm_message_t state)
 
 	ite_dbg("%s called", __func__);
 
+	/* wait for any transmission to end */
+	wait_event_interruptible(dev->tx_ended, !dev->transmitting);
+
 	spin_lock_irqsave(&dev->lock, flags);
 
 	/* disable all interrupts */
@@ -1670,15 +1673,10 @@ static int ite_resume(struct pnp_dev *pdev)
 
 	spin_lock_irqsave(&dev->lock, flags);
 
-	if (dev->transmitting) {
-		/* wake up the transmitter */
-		wake_up_interruptible(&dev->tx_queue);
-	} else {
-		/* reinitialize hardware config registers */
-		dev->params.init_hardware(dev);
-		/* enable the receiver */
-		dev->params.enable_rx(dev);
-	}
+	/* reinitialize hardware config registers */
+	dev->params.init_hardware(dev);
+	/* enable the receiver */
+	dev->params.enable_rx(dev);
 
 	spin_unlock_irqrestore(&dev->lock, flags);