From c2b71af51147d003623bac0052a0da1ee6ef3e16 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Tue, 11 Sep 2012 07:11:24 -0300
Subject: [PATCH] --- yaml --- r: 333821 b: refs/heads/master c:
 48cafec9a941c2dfe94d76642662bc20bf87fe08 h: refs/heads/master i:   333819:
 02bfa8d4fc9582122e0207dcbe63658e1e50de45 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/media/rc/ene_ir.c      | 5 ++++-
 trunk/drivers/media/rc/nuvoton-cir.c | 3 +++
 trunk/drivers/media/rc/redrat3.c     | 3 +++
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 419ef4d8dcaf..364f2e08ed67 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a52eb6c02fa27efb5f8980312785fce1f77377e2
+refs/heads/master: 48cafec9a941c2dfe94d76642662bc20bf87fe08
diff --git a/trunk/drivers/media/rc/ene_ir.c b/trunk/drivers/media/rc/ene_ir.c
index 647dd951b0e8..d05ac15b5de4 100644
--- a/trunk/drivers/media/rc/ene_ir.c
+++ b/trunk/drivers/media/rc/ene_ir.c
@@ -881,10 +881,13 @@ static int ene_set_tx_mask(struct rc_dev *rdev, u32 tx_mask)
 static int ene_set_tx_carrier(struct rc_dev *rdev, u32 carrier)
 {
 	struct ene_device *dev = rdev->priv;
-	u32 period = 2000000 / carrier;
+	u32 period;
 
 	dbg("TX: attempt to set tx carrier to %d kHz", carrier);
+	if (carrier == 0)
+		return -EINVAL;
 
+	period = 2000000 / carrier;
 	if (period && (period > ENE_CIRMOD_PRD_MAX ||
 			period < ENE_CIRMOD_PRD_MIN)) {
 
diff --git a/trunk/drivers/media/rc/nuvoton-cir.c b/trunk/drivers/media/rc/nuvoton-cir.c
index 699eef39128b..2ea913a44ae8 100644
--- a/trunk/drivers/media/rc/nuvoton-cir.c
+++ b/trunk/drivers/media/rc/nuvoton-cir.c
@@ -517,6 +517,9 @@ static int nvt_set_tx_carrier(struct rc_dev *dev, u32 carrier)
 	struct nvt_dev *nvt = dev->priv;
 	u16 val;
 
+	if (carrier == 0)
+		return -EINVAL;
+
 	nvt_cir_reg_write(nvt, 1, CIR_CP);
 	val = 3000000 / (carrier) - 1;
 	nvt_cir_reg_write(nvt, val & 0xff, CIR_CC);
diff --git a/trunk/drivers/media/rc/redrat3.c b/trunk/drivers/media/rc/redrat3.c
index 49731b1a9c57..9f5a17bb5ef5 100644
--- a/trunk/drivers/media/rc/redrat3.c
+++ b/trunk/drivers/media/rc/redrat3.c
@@ -890,6 +890,9 @@ static int redrat3_set_tx_carrier(struct rc_dev *rcdev, u32 carrier)
 	struct device *dev = rr3->dev;
 
 	rr3_dbg(dev, "Setting modulation frequency to %u", carrier);
+	if (carrier == 0)
+		return -EINVAL;
+
 	rr3->carrier = carrier;
 
 	return carrier;