Am 04.01.2014 11:55, schrieb Mauro Carvalho Chehab:
> Better to split chipset detection from the audio setup. So, move the
> detection code to em28xx_init_dev().
>
> Signed-off-by: Mauro Carvalho Chehab <m.chehab@xxxxxxxxxxx>
> ---
> drivers/media/usb/em28xx/em28xx-cards.c | 11 +++++++++++
> drivers/media/usb/em28xx/em28xx-core.c | 12 +-----------
> 2 files changed, 12 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/media/usb/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c
> index d1c75e66554c..4fe742429f2c 100644
> --- a/drivers/media/usb/em28xx/em28xx-cards.c
> +++ b/drivers/media/usb/em28xx/em28xx-cards.c
> @@ -2930,6 +2930,16 @@ static int em28xx_init_dev(struct em28xx *dev, struct usb_device *udev,
> }
> }
>
> + if (dev->chip_id == CHIP_ID_EM2870 ||
> + dev->chip_id == CHIP_ID_EM2874 ||
> + dev->chip_id == CHIP_ID_EM28174 ||
> + dev->chip_id == CHIP_ID_EM28178) {
> + /* Digital only device - don't load any alsa module */
> + dev->audio_mode.has_audio = false;
> + dev->has_audio_class = false;
> + dev->has_alsa_audio = false;
> + }
> +
> if (chip_name != default_chip_name)
> printk(KERN_INFO DRIVER_NAME
> ": chip ID is %s\n", chip_name);
> @@ -3196,6 +3206,7 @@ static int em28xx_usb_probe(struct usb_interface *interface,
> dev->alt = -1;
> dev->is_audio_only = has_audio && !(has_video || has_dvb);
> dev->has_alsa_audio = has_audio;
> + dev->audio_mode.has_audio = has_audio;
> dev->has_video = has_video;
> dev->audio_ifnum = ifnum;
>
> diff --git a/drivers/media/usb/em28xx/em28xx-core.c b/drivers/media/usb/em28xx/em28xx-core.c
> index 33cf26e106b5..818248d3fd28 100644
> --- a/drivers/media/usb/em28xx/em28xx-core.c
> +++ b/drivers/media/usb/em28xx/em28xx-core.c
> @@ -505,18 +505,8 @@ int em28xx_audio_setup(struct em28xx *dev)
> int vid1, vid2, feat, cfg;
> u32 vid;
>
> - if (dev->chip_id == CHIP_ID_EM2870 ||
> - dev->chip_id == CHIP_ID_EM2874 ||
> - dev->chip_id == CHIP_ID_EM28174 ||
> - dev->chip_id == CHIP_ID_EM28178) {
> - /* Digital only device - don't load any alsa module */
> - dev->audio_mode.has_audio = false;
> - dev->has_audio_class = false;
> - dev->has_alsa_audio = false;
> + if (!dev->audio_mode.has_audio)
> return 0;
> - }
> -
> - dev->audio_mode.has_audio = true;
>
> /* See how this device is configured */
> cfg = em28xx_read_reg(dev, EM28XX_R00_CHIPCFG);
It's not clear to me how one of these audio variables could ever become
true with these chip types, so this code should probably just be removed.
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
