[PATCH 2/4] [media] em28xx: i2s 5 sample rates is a subset of 3 one.

2013-07-16 Thread Alban Browaeys 
As:
EM28XX_CHIPCFG_I2S_3_SAMPRATES 0x20
EM28XX_CHIPCFG_I2S_5_SAMPRATES 0x30

the board chipcfg is 0xf0 thus if 3_SAMPRATES is tested
first and matches while it is a 5_SAMPRATES.

Signed-off-by: Alban Browaeys 
---
 drivers/media/usb/em28xx/em28xx-core.c | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/media/usb/em28xx/em28xx-core.c 
b/drivers/media/usb/em28xx/em28xx-core.c
index fc157af..3c0c5e9 100644
--- a/drivers/media/usb/em28xx/em28xx-core.c
+++ b/drivers/media/usb/em28xx/em28xx-core.c
@@ -505,13 +505,13 @@ int em28xx_audio_setup(struct em28xx *dev)
dev->audio_mode.has_audio = false;
return 0;
} else if ((cfg & EM28XX_CHIPCFG_AUDIOMASK) ==
-  EM28XX_CHIPCFG_I2S_3_SAMPRATES) {
-   em28xx_info("I2S Audio (3 sample rates)\n");
-   dev->audio_mode.i2s_3rates = 1;
-   } else if ((cfg & EM28XX_CHIPCFG_AUDIOMASK) ==
   EM28XX_CHIPCFG_I2S_5_SAMPRATES) {
em28xx_info("I2S Audio (5 sample rates)\n");
dev->audio_mode.i2s_5rates = 1;
+   } else if ((cfg & EM28XX_CHIPCFG_AUDIOMASK) ==
+  EM28XX_CHIPCFG_I2S_3_SAMPRATES) {
+   em28xx_info("I2S Audio (3 sample rates)\n");
+   dev->audio_mode.i2s_3rates = 1;
}
 
if ((cfg & EM28XX_CHIPCFG_AUDIOMASK) != EM28XX_CHIPCFG_AC97) {
-- 
1.8.3.2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH 2/4] [media] em28xx: i2s 5 sample rates is a subset of 3 one.

2013-07-16 Thread Alban Browaeys 
As:
EM28XX_CHIPCFG_I2S_3_SAMPRATES 0x20
EM28XX_CHIPCFG_I2S_5_SAMPRATES 0x30

the board chipcfg is 0xf0 thus if 3_SAMPRATES is tested
first and matches while it is a 5_SAMPRATES.

Signed-off-by: Alban Browaeys pra...@yahoo.com
---
 drivers/media/usb/em28xx/em28xx-core.c | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/media/usb/em28xx/em28xx-core.c 
b/drivers/media/usb/em28xx/em28xx-core.c
index fc157af..3c0c5e9 100644
--- a/drivers/media/usb/em28xx/em28xx-core.c
+++ b/drivers/media/usb/em28xx/em28xx-core.c
@@ -505,13 +505,13 @@ int em28xx_audio_setup(struct em28xx *dev)
dev-audio_mode.has_audio = false;
return 0;
} else if ((cfg  EM28XX_CHIPCFG_AUDIOMASK) ==
-  EM28XX_CHIPCFG_I2S_3_SAMPRATES) {
-   em28xx_info(I2S Audio (3 sample rates)\n);
-   dev-audio_mode.i2s_3rates = 1;
-   } else if ((cfg  EM28XX_CHIPCFG_AUDIOMASK) ==
   EM28XX_CHIPCFG_I2S_5_SAMPRATES) {
em28xx_info(I2S Audio (5 sample rates)\n);
dev-audio_mode.i2s_5rates = 1;
+   } else if ((cfg  EM28XX_CHIPCFG_AUDIOMASK) ==
+  EM28XX_CHIPCFG_I2S_3_SAMPRATES) {
+   em28xx_info(I2S Audio (3 sample rates)\n);
+   dev-audio_mode.i2s_3rates = 1;
}
 
if ((cfg  EM28XX_CHIPCFG_AUDIOMASK) != EM28XX_CHIPCFG_AC97) {
-- 
1.8.3.2

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/