[PATCH] misc: aspeed-p2a-ctrl: fix mixed declarations
Andrew Jeffery
andrew at aj.id.au
Thu May 2 13:38:12 AEST 2019
On Sat, 27 Apr 2019, at 02:27, Patrick Venture wrote:
> Fix up mixed declarations and code in aspeed_p2a_mmap.
>
> Tested: Verified the build had the error and that this patch resolved it
> and there were no other warnings or build errors associated with
> compilation of this driver.
>
> Reported-by: Stephen Rothwell <sfr at canb.auug.org.au>
> Signed-off-by: Patrick Venture <venture at google.com>
Reviewed-by: Andrew Jeffery <andrew at aj.id.au>
> ---
> drivers/misc/aspeed-p2a-ctrl.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/misc/aspeed-p2a-ctrl.c
> b/drivers/misc/aspeed-p2a-ctrl.c
> index 9736821972ef..b60fbeaffcbd 100644
> --- a/drivers/misc/aspeed-p2a-ctrl.c
> +++ b/drivers/misc/aspeed-p2a-ctrl.c
> @@ -100,6 +100,7 @@ static void aspeed_p2a_disable_bridge(struct
> aspeed_p2a_ctrl *p2a_ctrl)
> static int aspeed_p2a_mmap(struct file *file, struct vm_area_struct
> *vma)
> {
> unsigned long vsize;
> + pgprot_t prot;
> struct aspeed_p2a_user *priv = file->private_data;
> struct aspeed_p2a_ctrl *ctrl = priv->parent;
>
> @@ -107,7 +108,7 @@ static int aspeed_p2a_mmap(struct file *file,
> struct vm_area_struct *vma)
> return -EINVAL;
>
> vsize = vma->vm_end - vma->vm_start;
> - pgprot_t prot = vma->vm_page_prot;
> + prot = vma->vm_page_prot;
>
> if (vma->vm_pgoff + vsize > ctrl->mem_base + ctrl->mem_size)
> return -EINVAL;
> --
> 2.21.0.593.g511ec345e18-goog
>
>
More information about the Linux-aspeed
mailing list