Skip to content

Commit

Permalink
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel…
Browse files Browse the repository at this point in the history 
…/git/mchehab/v4l-dvb

* 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
  V4L/DVB (5822): Fix the return value in ttpci_budget_init()
  V4L/DVB (5818): CinergyT2: fix flush_workqueue() vs work->func() deadlock
  V4L/DVB (5816): Cx88-blackbird: fix vidioc_g_tuner never ending list of tuners
  V4L/DVB (5808): Bttv: fix v4l1 breaking the driver
  • Loading branch information
Linus Torvalds committed Jul 3, 2007
2 parents dbc55fa + 1fb4a17 commit f744a05
Show file tree
Hide file tree
Showing 4 changed files with 49 additions and 34 deletions.
66 changes: 40 additions & 26 deletions drivers/media/dvb/cinergyT2/cinergyT2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ struct cinergyt2 {
struct dvb_demux demux;
struct usb_device *udev;
struct mutex sem;
struct mutex wq_sem;
struct dvb_adapter adapter;
struct dvb_device *fedev;
struct dmxdev dmxdev;
Expand Down Expand Up @@ -482,14 +483,14 @@ static int cinergyt2_open (struct inode *inode, struct file *file)
struct cinergyt2 *cinergyt2 = dvbdev->priv;
int err = -ERESTARTSYS;

if (cinergyt2->disconnect_pending || mutex_lock_interruptible(&cinergyt2->sem))
return -ERESTARTSYS;
if (cinergyt2->disconnect_pending || mutex_lock_interruptible(&cinergyt2->wq_sem))
goto out;

if ((err = dvb_generic_open(inode, file))) {
mutex_unlock(&cinergyt2->sem);
return err;
}
if (mutex_lock_interruptible(&cinergyt2->sem))
goto out_unlock1;

if ((err = dvb_generic_open(inode, file)))
goto out_unlock2;

if ((file->f_flags & O_ACCMODE) != O_RDONLY) {
cinergyt2_sleep(cinergyt2, 0);
Expand All @@ -498,8 +499,12 @@ static int cinergyt2_open (struct inode *inode, struct file *file)

atomic_inc(&cinergyt2->inuse);

out_unlock2:
mutex_unlock(&cinergyt2->sem);
return 0;
out_unlock1:
mutex_unlock(&cinergyt2->wq_sem);
out:
return err;
}

static void cinergyt2_unregister(struct cinergyt2 *cinergyt2)
Expand All @@ -519,15 +524,17 @@ static int cinergyt2_release (struct inode *inode, struct file *file)
struct dvb_device *dvbdev = file->private_data;
struct cinergyt2 *cinergyt2 = dvbdev->priv;

mutex_lock(&cinergyt2->sem);
mutex_lock(&cinergyt2->wq_sem);

if (!cinergyt2->disconnect_pending && (file->f_flags & O_ACCMODE) != O_RDONLY) {
cancel_delayed_work(&cinergyt2->query_work);
flush_scheduled_work();
cancel_rearming_delayed_work(&cinergyt2->query_work);

mutex_lock(&cinergyt2->sem);
cinergyt2_sleep(cinergyt2, 1);
mutex_unlock(&cinergyt2->sem);
}

mutex_unlock(&cinergyt2->sem);
mutex_unlock(&cinergyt2->wq_sem);

if (atomic_dec_and_test(&cinergyt2->inuse) && cinergyt2->disconnect_pending) {
warn("delayed unregister in release");
Expand Down Expand Up @@ -838,13 +845,13 @@ static int cinergyt2_register_rc(struct cinergyt2 *cinergyt2)

static void cinergyt2_unregister_rc(struct cinergyt2 *cinergyt2)
{
cancel_delayed_work(&cinergyt2->rc_query_work);
cancel_rearming_delayed_work(&cinergyt2->rc_query_work);
input_unregister_device(cinergyt2->rc_input_dev);
}

static inline void cinergyt2_suspend_rc(struct cinergyt2 *cinergyt2)
{
cancel_delayed_work(&cinergyt2->rc_query_work);
cancel_rearming_delayed_work(&cinergyt2->rc_query_work);
}

static inline void cinergyt2_resume_rc(struct cinergyt2 *cinergyt2)
Expand Down Expand Up @@ -907,6 +914,7 @@ static int cinergyt2_probe (struct usb_interface *intf,
usb_set_intfdata (intf, (void *) cinergyt2);

mutex_init(&cinergyt2->sem);
mutex_init(&cinergyt2->wq_sem);
init_waitqueue_head (&cinergyt2->poll_wq);
INIT_DELAYED_WORK(&cinergyt2->query_work, cinergyt2_query);

Expand Down Expand Up @@ -974,11 +982,8 @@ static void cinergyt2_disconnect (struct usb_interface *intf)
{
struct cinergyt2 *cinergyt2 = usb_get_intfdata (intf);

flush_scheduled_work();

cinergyt2_unregister_rc(cinergyt2);

cancel_delayed_work(&cinergyt2->query_work);
cancel_rearming_delayed_work(&cinergyt2->query_work);
wake_up_interruptible(&cinergyt2->poll_wq);

cinergyt2->demux.dmx.close(&cinergyt2->demux.dmx);
Expand All @@ -992,31 +997,37 @@ static int cinergyt2_suspend (struct usb_interface *intf, pm_message_t state)
{
struct cinergyt2 *cinergyt2 = usb_get_intfdata (intf);

if (cinergyt2->disconnect_pending || mutex_lock_interruptible(&cinergyt2->sem))
if (cinergyt2->disconnect_pending || mutex_lock_interruptible(&cinergyt2->wq_sem))
return -ERESTARTSYS;

if (1) {
struct cinergyt2 *cinergyt2 = usb_get_intfdata (intf);

cinergyt2_suspend_rc(cinergyt2);
cancel_delayed_work(&cinergyt2->query_work);
cancel_rearming_delayed_work(&cinergyt2->query_work);

mutex_lock(&cinergyt2->sem);
if (cinergyt2->streaming)
cinergyt2_stop_stream_xfer(cinergyt2);
flush_scheduled_work();
cinergyt2_sleep(cinergyt2, 1);
mutex_unlock(&cinergyt2->sem);
}

mutex_unlock(&cinergyt2->sem);
mutex_unlock(&cinergyt2->wq_sem);
return 0;
}

static int cinergyt2_resume (struct usb_interface *intf)
{
struct cinergyt2 *cinergyt2 = usb_get_intfdata (intf);
struct dvbt_set_parameters_msg *param = &cinergyt2->param;
int err = -ERESTARTSYS;

if (cinergyt2->disconnect_pending || mutex_lock_interruptible(&cinergyt2->sem))
return -ERESTARTSYS;
if (cinergyt2->disconnect_pending || mutex_lock_interruptible(&cinergyt2->wq_sem))
goto out;

if (mutex_lock_interruptible(&cinergyt2->sem))
goto out_unlock1;

err = 0;

if (!cinergyt2->sleeping) {
cinergyt2_sleep(cinergyt2, 0);
Expand All @@ -1029,7 +1040,10 @@ static int cinergyt2_resume (struct usb_interface *intf)
cinergyt2_resume_rc(cinergyt2);

mutex_unlock(&cinergyt2->sem);
return 0;
out_unlock1:
mutex_unlock(&cinergyt2->wq_sem);
out:
return err;
}

static const struct usb_device_id cinergyt2_table [] __devinitdata = {
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/dvb/ttpci/budget-core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,7 @@ int ttpci_budget_init(struct budget *budget, struct saa7146_dev *dev,
if (bi->type != BUDGET_FS_ACTIVY)
saa7146_setgpio(dev, 2, SAA7146_GPIO_OUTHI);

if (budget_register(budget) == 0)
if ((ret = budget_register(budget)) == 0)
return 0; /* Everything OK */

/* An error occurred, cleanup resources */
Expand Down
13 changes: 6 additions & 7 deletions drivers/media/video/bt8xx/bttv-driver.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1331,7 +1331,7 @@ set_tvnorm(struct bttv *btv, unsigned int norm)

/* Call with btv->lock down. */
static void
set_input(struct bttv *btv, unsigned int input)
set_input(struct bttv *btv, unsigned int input, unsigned int norm)
{
unsigned long flags;

Expand All @@ -1350,7 +1350,7 @@ set_input(struct bttv *btv, unsigned int input)
}
audio_input(btv,(input == bttv_tvcards[btv->c.type].tuner ?
TVAUDIO_INPUT_TUNER : TVAUDIO_INPUT_EXTERN));
set_tvnorm(btv,btv->tvnorm);
set_tvnorm(btv, norm);
i2c_vidiocschan(btv);
}

Expand Down Expand Up @@ -1441,7 +1441,7 @@ static void bttv_reinit_bt848(struct bttv *btv)

init_bt848(btv);
btv->pll.pll_current = -1;
set_input(btv,btv->input);
set_input(btv, btv->input, btv->tvnorm);
}

static int get_control(struct bttv *btv, struct v4l2_control *c)
Expand Down Expand Up @@ -2011,8 +2011,7 @@ static int bttv_common_ioctls(struct bttv *btv, unsigned int cmd, void *arg)
return 0;
}

btv->tvnorm = v->norm;
set_input(btv,v->channel);
set_input(btv, v->channel, v->norm);
mutex_unlock(&btv->lock);
return 0;
}
Expand Down Expand Up @@ -2148,7 +2147,7 @@ static int bttv_common_ioctls(struct bttv *btv, unsigned int cmd, void *arg)
if (*i > bttv_tvcards[btv->c.type].video_inputs)
return -EINVAL;
mutex_lock(&btv->lock);
set_input(btv,*i);
set_input(btv, *i, btv->tvnorm);
mutex_unlock(&btv->lock);
return 0;
}
Expand Down Expand Up @@ -4780,7 +4779,7 @@ static int __devinit bttv_probe(struct pci_dev *dev,
bt848_hue(btv,32768);
bt848_sat(btv,32768);
audio_mute(btv, 1);
set_input(btv,0);
set_input(btv, 0, btv->tvnorm);
bttv_crop_reset(&btv->crop[0], btv->tvnorm);
btv->crop[1] = btv->crop[0]; /* current = default */
disclaim_vbi_lines(btv);
Expand Down
2 changes: 2 additions & 0 deletions drivers/media/video/cx88/cx88-blackbird.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1034,6 +1034,8 @@ static int vidioc_g_tuner (struct file *file, void *priv,

if (unlikely(UNSET == core->tuner_type))
return -EINVAL;
if (0 != t->index)
return -EINVAL;

strcpy(t->name, "Television");
t->type = V4L2_TUNER_ANALOG_TV;
Expand Down

0 comments on commit f744a05

Please sign in to comment.