Skip to content

Commit

Permalink
DVB (2401): USB hot unplug Oops fix.
Browse files Browse the repository at this point in the history 
- USB hot unplug Oops fix.

Signed-off-by: Deti Fliegl <deti@fliegl.de>
Signed-off-by: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
  • Loading branch information
Deti Fliegl authored and Mauro Carvalho Chehab committed Jan 9, 2006
1 parent 6a5bdd3 commit e4acba3
Showing 1 changed file with 47 additions and 24 deletions.
71 changes: 47 additions & 24 deletions drivers/media/dvb/cinergyT2/cinergyT2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,8 @@ struct cinergyt2 {

wait_queue_head_t poll_wq;
int pending_fe_events;
int disconnect_pending;
atomic_t inuse;

void *streambuf;
dma_addr_t streambuf_dmahandle;
Expand Down Expand Up @@ -343,7 +345,7 @@ static int cinergyt2_start_feed(struct dvb_demux_feed *dvbdmxfeed)
struct dvb_demux *demux = dvbdmxfeed->demux;
struct cinergyt2 *cinergyt2 = demux->priv;

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

if (cinergyt2->streaming == 0)
Expand All @@ -359,7 +361,7 @@ static int cinergyt2_stop_feed(struct dvb_demux_feed *dvbdmxfeed)
struct dvb_demux *demux = dvbdmxfeed->demux;
struct cinergyt2 *cinergyt2 = demux->priv;

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

if (--cinergyt2->streaming == 0)
Expand Down Expand Up @@ -479,23 +481,37 @@ static int cinergyt2_open (struct inode *inode, struct file *file)
{
struct dvb_device *dvbdev = file->private_data;
struct cinergyt2 *cinergyt2 = dvbdev->priv;
int err;
int err = -ERESTARTSYS;

if ((err = dvb_generic_open(inode, file)))
if (cinergyt2->disconnect_pending || down_interruptible(&cinergyt2->sem))
return -ERESTARTSYS;

if ((err = dvb_generic_open(inode, file))) {
up(&cinergyt2->sem);
return err;
}

if (down_interruptible(&cinergyt2->sem))
return -ERESTARTSYS;

if ((file->f_flags & O_ACCMODE) != O_RDONLY) {
cinergyt2_sleep(cinergyt2, 0);
schedule_delayed_work(&cinergyt2->query_work, HZ/2);
}

atomic_inc(&cinergyt2->inuse);

up(&cinergyt2->sem);
return 0;
}

static void cinergyt2_unregister(struct cinergyt2 *cinergyt2)
{
dvb_unregister_device(cinergyt2->fedev);
dvb_unregister_adapter(&cinergyt2->adapter);

cinergyt2_free_stream_urbs(cinergyt2);
kfree(cinergyt2);
}

static int cinergyt2_release (struct inode *inode, struct file *file)
{
struct dvb_device *dvbdev = file->private_data;
Expand All @@ -504,22 +520,34 @@ static int cinergyt2_release (struct inode *inode, struct file *file)
if (down_interruptible(&cinergyt2->sem))
return -ERESTARTSYS;

if ((file->f_flags & O_ACCMODE) != O_RDONLY) {
if (!cinergyt2->disconnect_pending && (file->f_flags & O_ACCMODE) != O_RDONLY) {
cancel_delayed_work(&cinergyt2->query_work);
flush_scheduled_work();
cinergyt2_sleep(cinergyt2, 1);
}

up(&cinergyt2->sem);

if (atomic_dec_and_test(&cinergyt2->inuse) && cinergyt2->disconnect_pending) {
warn("delayed unregister in release");
cinergyt2_unregister(cinergyt2);
}

return dvb_generic_release(inode, file);
}

static unsigned int cinergyt2_poll (struct file *file, struct poll_table_struct *wait)
{
struct dvb_device *dvbdev = file->private_data;
struct cinergyt2 *cinergyt2 = dvbdev->priv;

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

poll_wait(file, &cinergyt2->poll_wq, wait);

up(&cinergyt2->sem);

return (POLLIN | POLLRDNORM | POLLPRI);
}

Expand Down Expand Up @@ -585,7 +613,7 @@ static int cinergyt2_ioctl (struct inode *inode, struct file *file,
if (copy_from_user(&p, (void __user*) arg, sizeof(p)))
return -EFAULT;

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

param->cmd = CINERGYT2_EP1_SET_TUNER_PARAMETERS;
Expand Down Expand Up @@ -696,7 +724,7 @@ static void cinergyt2_query_rc (void *data)
struct cinergyt2_rc_event rc_events[12];
int n, len, i;

if (down_interruptible(&cinergyt2->sem))
if (cinergyt2->disconnect_pending || down_interruptible(&cinergyt2->sem))
return;

len = cinergyt2_command(cinergyt2, buf, sizeof(buf),
Expand Down Expand Up @@ -791,7 +819,6 @@ static int cinergyt2_register_rc(struct cinergyt2 *cinergyt2)
static void cinergyt2_unregister_rc(struct cinergyt2 *cinergyt2)
{
cancel_delayed_work(&cinergyt2->rc_query_work);
flush_scheduled_work();
input_unregister_device(cinergyt2->rc_input_dev);
}

Expand Down Expand Up @@ -822,7 +849,7 @@ static void cinergyt2_query (void *data)
uint8_t lock_bits;
uint32_t unc;

if (down_interruptible(&cinergyt2->sem))
if (cinergyt2->disconnect_pending || down_interruptible(&cinergyt2->sem))
return;

unc = s->uncorrected_block_count;
Expand Down Expand Up @@ -922,28 +949,25 @@ static void cinergyt2_disconnect (struct usb_interface *intf)
{
struct cinergyt2 *cinergyt2 = usb_get_intfdata (intf);

if (down_interruptible(&cinergyt2->sem))
return;
flush_scheduled_work();

cinergyt2_unregister_rc(cinergyt2);

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

cinergyt2->demux.dmx.close(&cinergyt2->demux.dmx);
dvb_net_release(&cinergyt2->dvbnet);
dvb_dmxdev_release(&cinergyt2->dmxdev);
dvb_dmx_release(&cinergyt2->demux);
dvb_unregister_device(cinergyt2->fedev);
dvb_unregister_adapter(&cinergyt2->adapter);
cinergyt2->disconnect_pending = 1;

cinergyt2_free_stream_urbs(cinergyt2);
up(&cinergyt2->sem);
kfree(cinergyt2);
if (!atomic_read(&cinergyt2->inuse))
cinergyt2_unregister(cinergyt2);
}

static int cinergyt2_suspend (struct usb_interface *intf, pm_message_t state)
{
struct cinergyt2 *cinergyt2 = usb_get_intfdata (intf);

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

if (state.event > PM_EVENT_ON) {
Expand All @@ -966,7 +990,7 @@ static int cinergyt2_resume (struct usb_interface *intf)
struct cinergyt2 *cinergyt2 = usb_get_intfdata (intf);
struct dvbt_set_parameters_msg *param = &cinergyt2->param;

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

if (!cinergyt2->sleeping) {
Expand Down Expand Up @@ -1019,4 +1043,3 @@ module_exit (cinergyt2_exit);

MODULE_LICENSE("GPL");
MODULE_AUTHOR("Holger Waechtler, Daniel Mack");

0 comments on commit e4acba3

Please sign in to comment.