Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94001602 authored by Patrick Venture's avatar Patrick Venture Committed by Greg Kroah-Hartman
Browse files

misc: aspeed-p2a-ctrl: fix mixed declarations 



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: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarPatrick Venture <venture@google.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2d1c31cb

drivers/misc/aspeed-p2a-ctrl.c

+2 −1
Original line number Diff line number Diff line
@@ -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;