Commit 5daf53a6 authored by Hans de Goede's avatar Hans de Goede Committed by Mauro Carvalho Chehab
Browse files

[media] snd_tea575x: Make the module using snd_tea575x the fops owner 



Before this patch the owner field of the /dev/radio# device fops was set to
the snd-tea575x-tuner module itself. Meaning that the module which was using
it could be rmmod-ed while the device is open, and then BAD things happen.

I know, as I found out the hard way :)

Note that there is no need to also somehow increase the refcount of the
snd-tea575x-tuner module itself, since any drivers using it will have
symbolic references to it.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
CC: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 0875eb75

drivers/media/radio/radio-maxiradio.c

+1 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ static int __devinit maxiradio_probe(struct pci_dev *pdev, const struct pci_devi 
		goto err_out_free_region;



	dev->io = pci_resource_start(pdev, 0);

	if (snd_tea575x_init(&dev->tea)) {

	if (snd_tea575x_init(&dev->tea, THIS_MODULE)) {

		printk(KERN_ERR "radio-maxiradio: Unable to detect TEA575x tuner\n");

		goto err_out_free_region;

	}

drivers/media/radio/radio-sf16fmr2.c

+1 −1
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ static int __devinit fmr2_probe(struct fmr2 *fmr2, struct device *pdev, int io) 
	snprintf(fmr2->tea.bus_info, sizeof(fmr2->tea.bus_info), "%s:%s",

			fmr2->is_fmd2 ? "PnP" : "ISA", dev_name(pdev));



	if (snd_tea575x_init(&fmr2->tea)) {

	if (snd_tea575x_init(&fmr2->tea, THIS_MODULE)) {

		printk(KERN_ERR "radio-sf16fmr2: Unable to detect TEA575x tuner\n");

		release_region(fmr2->io, 2);

		return -ENODEV;

include/sound/tea575x-tuner.h

+2 −1
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ struct snd_tea575x_ops { 


struct snd_tea575x {

	struct v4l2_device *v4l2_dev;

	struct v4l2_file_operations fops;

	struct video_device vd;		/* video device */

	int radio_nr;			/* radio_nr */

	bool tea5759;			/* 5759 chip is present */
@@ -62,7 +63,7 @@ struct snd_tea575x { 
	int (*ext_init)(struct snd_tea575x *tea);

};



int snd_tea575x_init(struct snd_tea575x *tea);

int snd_tea575x_init(struct snd_tea575x *tea, struct module *owner);

void snd_tea575x_exit(struct snd_tea575x *tea);



#endif /* __SOUND_TEA575X_TUNER_H */

sound/i2c/other/tea575x-tuner.c

+4 −3
Original line number Diff line number Diff line
@@ -317,7 +317,6 @@ static int tea575x_s_ctrl(struct v4l2_ctrl *ctrl) 
}



static const struct v4l2_file_operations tea575x_fops = {

	.owner		= THIS_MODULE,

	.unlocked_ioctl	= video_ioctl2,

	.open           = v4l2_fh_open,

	.release        = v4l2_fh_release,
@@ -337,7 +336,6 @@ static const struct v4l2_ioctl_ops tea575x_ioctl_ops = { 
};



static const struct video_device tea575x_radio = {

	.fops           = &tea575x_fops,

	.ioctl_ops 	= &tea575x_ioctl_ops,

	.release        = video_device_release_empty,

};
@@ -349,7 +347,7 @@ static const struct v4l2_ctrl_ops tea575x_ctrl_ops = { 
/*

 * initialize all the tea575x chips

 */

int snd_tea575x_init(struct snd_tea575x *tea)

int snd_tea575x_init(struct snd_tea575x *tea, struct module *owner)

{

	int retval;
@@ -374,6 +372,9 @@ int snd_tea575x_init(struct snd_tea575x *tea) 
	tea->vd.lock = &tea->mutex;

	tea->vd.v4l2_dev = tea->v4l2_dev;

	tea->vd.ctrl_handler = &tea->ctrl_handler;

	tea->fops = tea575x_fops;

	tea->fops.owner = owner;

	tea->vd.fops = &tea->fops;

	set_bit(V4L2_FL_USE_FH_PRIO, &tea->vd.flags);

	/* disable hw_freq_seek if we can't use it */

	if (tea->cannot_read_data)

sound/pci/es1968.c

+1 −1
Original line number Diff line number Diff line
@@ -2769,7 +2769,7 @@ static int __devinit snd_es1968_create(struct snd_card *card, 
	chip->tea.ops = &snd_es1968_tea_ops;

	strlcpy(chip->tea.card, "SF64-PCE2", sizeof(chip->tea.card));

	sprintf(chip->tea.bus_info, "PCI:%s", pci_name(pci));

	if (!snd_tea575x_init(&chip->tea))

	if (!snd_tea575x_init(&chip->tea, THIS_MODULE))

		printk(KERN_INFO "es1968: detected TEA575x radio\n");

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE