Re: [PATCH 1/1] hdpvr: code cleanup

[Mauro Carvalho Chehab <mchehab@s-opensource.com>]

Em Tue, 14 Feb 2017 20:18:32 -0500
Jonathan Sims <jonathan.625266@earthlink.net> escreveu:

> This is a code cleanup after recent changes introduced by commit a503ff812430e104f591287b512aa4e3a83f20b1.

Patch doesn't apply:

patch -p1 -i patches/lmml_39419_1_1_hdpvr_code_cleanup.patch --dry-run -t -N
checking file drivers/media/usb/hdpvr/hdpvr-video.c
patch: **** malformed patch at line 35: __user *buffer, size_t count, goto err;

Patch may be line wrapped
checking file drivers/media/usb/hdpvr/hdpvr-video.c
patch: **** unexpected end of file in patch


Your e-mailer is breaking long lines, causing it to not work.

Please either configure your e-mailer to not wrap long lines or
use git to send it.


> 
> Signed-off-by: Jonathan Sims <jonathan.625266@earthlink.net>
> ---
> 
>  drivers/media/usb/hdpvr/hdpvr-video.c | 18 +++++++-----------
>  1 file changed, 7 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/media/usb/hdpvr/hdpvr-video.c b/drivers/media/usb/hdpvr/hdpvr-video.c
> index 7fb036d6a86e..b2ce5c0807fb 100644
> --- a/drivers/media/usb/hdpvr/hdpvr-video.c
> +++ b/drivers/media/usb/hdpvr/hdpvr-video.c
> @@ -449,7 +449,7 @@ static ssize_t hdpvr_read(struct file *file, char __user *buffer, size_t count,
>  
>  		if (buf->status != BUFSTAT_READY &&
>  		    dev->status != STATUS_DISCONNECTED) {
> -			int err;
> +
>  			/* return nonblocking */
>  			if (file->f_flags & O_NONBLOCK) {
>  				if (!ret)
> @@ -457,23 +457,19 @@ static ssize_t hdpvr_read(struct file *file, char
> __user *buffer, size_t count, goto err;
>  			}
>  
> -			err =
> wait_event_interruptible_timeout(dev->wait_data,
> +			ret =
> wait_event_interruptible_timeout(dev->wait_data, buf->status ==
> BUFSTAT_READY, msecs_to_jiffies(1000));
> -			if (err < 0) {
> -				ret = err;
> +			if (ret < 0)
>  				goto err;
> -			}
> -			if (!err) {
> +			if (!ret) {
>  				v4l2_dbg(MSG_INFO, hdpvr_debug,
> &dev->v4l2_dev, "timeout: restart streaming\n");
>  				hdpvr_stop_streaming(dev);
> -				msecs_to_jiffies(4000);
> -				err = hdpvr_start_streaming(dev);
> -				if (err) {
> -					ret = err;
> +				msleep(4000);
> +				ret = hdpvr_start_streaming(dev);
> +				if (ret)
>  					goto err;
> -				}
>  			}
>  		}
>  



Thanks,
Mauro