From df8c89b86888a336b36db0d62dabe1a11ebcd60a Mon Sep 17 00:00:00 2001
From: Ondrej Zary <linux@rainbow-software.org>
Date: Thu, 12 May 2011 22:17:56 +0200
Subject: [PATCH] --- yaml --- r: 248178 b: refs/heads/master c:
 ea27316e4cd13b25727715c0db8adb0b1661f5e7 h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/include/sound/tea575x-tuner.h   | 3 ++-
 trunk/sound/i2c/other/tea575x-tuner.c | 8 ++++----
 trunk/sound/pci/es1968.c              | 1 -
 trunk/sound/pci/fm801.c               | 1 -
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 08cadd558413..fc0fd04eb6a3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f3f7c1837f6bcae3601fc535b339426868bf1549
+refs/heads/master: ea27316e4cd13b25727715c0db8adb0b1661f5e7
diff --git a/trunk/include/sound/tea575x-tuner.h b/trunk/include/sound/tea575x-tuner.h
index e50cb2934efe..0291f48e035e 100644
--- a/trunk/include/sound/tea575x-tuner.h
+++ b/trunk/include/sound/tea575x-tuner.h
@@ -26,6 +26,8 @@
 #include <media/v4l2-dev.h>
 #include <media/v4l2-ioctl.h>
 
+#define TEA575X_FMIF	10700
+
 #define TEA575X_DATA	(1 << 0)
 #define TEA575X_CLK	(1 << 1)
 #define TEA575X_WREN	(1 << 2)
@@ -46,7 +48,6 @@ struct snd_tea575x {
 	bool mute;			/* Device is muted? */
 	bool stereo;			/* receiving stereo */
 	bool tuned;			/* tuned to a station */
-	unsigned int freq_fixup;	/* crystal onboard */
 	unsigned int val;		/* hw value */
 	unsigned long freq;		/* frequency */
 	unsigned long in_use;		/* set if the device is in use */
diff --git a/trunk/sound/i2c/other/tea575x-tuner.c b/trunk/sound/i2c/other/tea575x-tuner.c
index 31f9795daca6..98ccec27e7bf 100644
--- a/trunk/sound/i2c/other/tea575x-tuner.c
+++ b/trunk/sound/i2c/other/tea575x-tuner.c
@@ -141,9 +141,9 @@ static void snd_tea575x_get_freq(struct snd_tea575x *tea)
 	freq /= 10;
 	/* crystal fixup */
 	if (tea->tea5759)
-		freq += tea->freq_fixup;
+		freq += TEA575X_FMIF;
 	else
-		freq -= tea->freq_fixup;
+		freq -= TEA575X_FMIF;
 
 	tea->freq = freq * 16;		/* from kHz */
 }
@@ -156,9 +156,9 @@ static void snd_tea575x_set_freq(struct snd_tea575x *tea)
 	freq /= 16;		/* to kHz */
 	/* crystal fixup */
 	if (tea->tea5759)
-		freq -= tea->freq_fixup;
+		freq -= TEA575X_FMIF;
 	else
-		freq += tea->freq_fixup;
+		freq += TEA575X_FMIF;
 	/* freq /= 12.5 */
 	freq *= 10;
 	freq /= 125;
diff --git a/trunk/sound/pci/es1968.c b/trunk/sound/pci/es1968.c
index 75c5e0ed6955..3f3ff1bae814 100644
--- a/trunk/sound/pci/es1968.c
+++ b/trunk/sound/pci/es1968.c
@@ -2794,7 +2794,6 @@ static int __devinit snd_es1968_create(struct snd_card *card,
 
 #ifdef CONFIG_SND_ES1968_RADIO
 	chip->tea.card = card;
-	chip->tea.freq_fixup = 10700;
 	chip->tea.private_data = chip;
 	chip->tea.ops = &snd_es1968_tea_ops;
 	if (!snd_tea575x_init(&chip->tea))
diff --git a/trunk/sound/pci/fm801.c b/trunk/sound/pci/fm801.c
index 5aa3fd6f25f7..1d4e71cc18b6 100644
--- a/trunk/sound/pci/fm801.c
+++ b/trunk/sound/pci/fm801.c
@@ -1231,7 +1231,6 @@ static int __devinit snd_fm801_create(struct snd_card *card,
 
 #ifdef TEA575X_RADIO
 	chip->tea.card = card;
-	chip->tea.freq_fixup = 10700;
 	chip->tea.private_data = chip;
 	chip->tea.ops = &snd_fm801_tea_ops;
 	if ((tea575x_tuner & TUNER_TYPE_MASK) > 0 &&