---

yaml
---
r: 250307
b: refs/heads/master
c: c812045
h: refs/heads/master
i:
  250305: 5d02bb0
  250303: 9ef6281
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f0c1629dca6ffd8b1b07654704ac56c5a63270e3
+refs/heads/master: c812045488afbe3830843fc6686ae84bfc928a5f

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);