[GIT PULL] Staging driver fixes for 5.11-rc3

2021-01-10 Thread Greg KH
The following changes since commit 5c8fe583cce542aa0b84adc939ce85293de36e5e:

  Linux 5.11-rc1 (2020-12-27 15:30:22 -0800)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git 
tags/staging-5.11-rc3

for you to fetch changes up to 00b8c557d096f0930d5c07df618223d3d06902d6:

  staging: ION: remove some references to CONFIG_ION (2021-01-06 17:39:38 +0100)


Staging driver fixes for 5.11-rc3

Here are some small staging driver fixes for 5.11-rc3.  Nothing major,
just resolving some reported issues:
- cleanup some remaining mentions of the ION drivers that were
  removed in 5.11-rc1
- comedi driver bugfix
- 2 error path memory leak fixes

All have been in linux-next for a while with no reported issues.

Signed-off-by: Greg Kroah-Hartman 


Christophe JAILLET (2):
  staging: spmi: hisi-spmi-controller: Fix some error handling paths
  staging: mt7621-dma: Fix a resource leak in an error handling path

Dan Carpenter (1):
  Staging: comedi: Return -EFAULT if copy_to_user() fails

Matthias Maennich (1):
  staging: ION: remove some references to CONFIG_ION

 drivers/staging/comedi/comedi_fops.c   |  4 +++-
 drivers/staging/hikey9xx/hisi-spmi-controller.c| 21 +++--
 drivers/staging/media/atomisp/pci/atomisp_subdev.c | 20 
 drivers/staging/mt7621-dma/mtk-hsdma.c |  4 +++-
 kernel/configs/android-recommended.config  |  1 -
 5 files changed, 21 insertions(+), 29 deletions(-)
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


Re: [PATCH v2 -next] media: zoran: convert comma to semicolon

2021-01-10 Thread LABBE Corentin
Le Fri, Jan 08, 2021 at 05:21:19PM +0800, Zheng Yongjun a écrit :
> Replace a comma between expression statements by a semicolon.
> 
> Signed-off-by: Zheng Yongjun 
> ---
>  drivers/staging/media/zoran/zoran_driver.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/staging/media/zoran/zoran_driver.c 
> b/drivers/staging/media/zoran/zoran_driver.c
> index 808196ea5b81..d60b4c73ea80 100644
> --- a/drivers/staging/media/zoran/zoran_driver.c
> +++ b/drivers/staging/media/zoran/zoran_driver.c
> @@ -1020,7 +1020,7 @@ int zoran_queue_init(struct zoran *zr, struct vb2_queue 
> *vq)
>   vq->buf_struct_size = sizeof(struct zr_buffer);
>   vq->ops = &zr_video_qops;
>   vq->mem_ops = &vb2_dma_contig_memops;
> - vq->gfp_flags = GFP_DMA32,
> + vq->gfp_flags = GFP_DMA32;
>   vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
>   vq->min_buffers_needed = 9;
>   vq->lock = &zr->lock;
> -- 
> 2.22.0
> 

Acked-by: Corentin Labbe 

Thanks!
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


Re: [GIT PULL] Staging driver fixes for 5.11-rc3

2021-01-10 Thread pr-tracker-bot
The pull request you sent on Sun, 10 Jan 2021 15:10:02 +0100:

> git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git 
> tags/staging-5.11-rc3

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/4ad9a28f56d70b950b1232151b2354636853727a

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel