From 7c83a5a8f81e3fd35626c25abf90abd75f0be7a1 Mon Sep 17 00:00:00 2001
From: Michael Krufky <mkrufky@kernellabs.com>
Date: Thu, 20 Oct 2011 15:42:34 +0100
Subject: [PATCH] --- yaml --- r: 273594 b: refs/heads/master c:
 7e8d8f6df3e8f26547b3b986c3946b1f8a6bd6c1 h: refs/heads/master v: v3

---
 [refs]                                           |  2 +-
 trunk/drivers/media/dvb/dvb-usb/mxl111sf-demod.c | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a6b9c43ced1e..eec52417e03a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4f98480f32fb11af40de3947cc5d500ec9691726
+refs/heads/master: 7e8d8f6df3e8f26547b3b986c3946b1f8a6bd6c1
diff --git a/trunk/drivers/media/dvb/dvb-usb/mxl111sf-demod.c b/trunk/drivers/media/dvb/dvb-usb/mxl111sf-demod.c
index 330774e346ab..25e75c1ae36e 100644
--- a/trunk/drivers/media/dvb/dvb-usb/mxl111sf-demod.c
+++ b/trunk/drivers/media/dvb/dvb-usb/mxl111sf-demod.c
@@ -370,10 +370,20 @@ static int mxl111sf_demod_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)
 	return ret;
 }
 
+#ifdef MXL111SF_DEMOD_ENABLE_CALCULATIONS
+/* FIXME: leaving this enabled breaks the build on some architectures,
+ * and we shouldn't have any floating point math in the kernel, anyway.
+ *
+ * These macros need to be re-written, but it's harmless to simply
+ * return zero for now. */
 #define CALCULATE_BER(avg_errors, count) \
 	((u32)(avg_errors * 4)/(count*64*188*8))
 #define CALCULATE_SNR(data) \
 	((u32)((10 * (u32)data / 64) - 2.5))
+#else
+#define CALCULATE_BER(avg_errors, count) 0
+#define CALCULATE_SNR(data) 0
+#endif
 
 static int mxl111sf_demod_read_ber(struct dvb_frontend *fe, u32 *ber)
 {