Hi Jonathan, It appears the v3 was merged and not this v4. It would be nice if you can make a new diff on top of the latest media_tree master code that does this code cleanup, because this v4 is much nicer with regard to error handling. Regards, Hans On 02/10/2017 01:54 AM, Jonathan Sims wrote: > This is a reworking of a patch originally submitted by Ryley Angus, modified by Hans Verkuil and then seemingly forgotten before changes suggested by Keith Pyle here: > > http://www.mail-archive.com/linux-media@xxxxxxxxxxxxxxx/msg75163.html > > were made and tested. > > I have implemented the suggested changes and have been testing for several months. I am no longer experiencing lockups while recording (with blue light on, requiring power cycling) which had been a long standing problem with the HD-PVR. I have not noticed any other problems since applying the patch. > > Signed-off-by: Jonathan Sims <jonathan.625266@xxxxxxxxxxxxx> > --- > > Changes in v4: > - Code cleanups. > > drivers/media/usb/hdpvr/hdpvr-video.c | 17 ++++++++++++++--- > 1 file changed, 14 insertions(+), 3 deletions(-) > > diff --git a/drivers/media/usb/hdpvr/hdpvr-video.c b/drivers/media/usb/hdpvr/hdpvr-video.c > index 474c11e1d495..f8ba28cb40eb 100644 > --- a/drivers/media/usb/hdpvr/hdpvr-video.c > +++ b/drivers/media/usb/hdpvr/hdpvr-video.c > @@ -458,9 +458,20 @@ static ssize_t hdpvr_read(struct file *file, char __user *buffer, size_t count, > goto err; > } > > - if (wait_event_interruptible(dev->wait_data, > - buf->status == BUFSTAT_READY)) > - return -ERESTARTSYS; > + ret = wait_event_interruptible_timeout(dev->wait_data, > + buf->status == BUFSTAT_READY, > + msecs_to_jiffies(1000)); > + if (ret < 0) > + goto err; > + if (!ret) { > + v4l2_dbg(MSG_INFO, hdpvr_debug, &dev->v4l2_dev, > + "timeout: restart streaming\n"); > + hdpvr_stop_streaming(dev); > + msleep(4000); > + ret = hdpvr_start_streaming(dev); > + if (ret) > + goto err; > + } > } > > if (buf->status != BUFSTAT_READY) >
