renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-27 06:34:11 +08:00
Code

misc: aspeed-p2a-ctrl: fix mixed declarations

Browse Source 
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@canb.auug.org.au>
Signed-off-by: Patrick Venture <venture@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Patrick Venture 2019-04-26 09:56:55 -07:00 committed by Greg Kroah-Hartman
parent 2d1c31cb64
commit 94001602d6
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/misc/aspeed-p2a-ctrl.c
View File

@ -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) static int aspeed_p2a_mmap(struct file *file, struct vm_area_struct *vma)
{ {
unsigned long vsize; unsigned long vsize;
pgprot_t prot;
struct aspeed_p2a_user *priv = file->private_data; struct aspeed_p2a_user *priv = file->private_data;
struct aspeed_p2a_ctrl *ctrl = priv->parent; 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; return -EINVAL;
vsize = vma->vm_end - vma->vm_start; 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) if (vma->vm_pgoff + vsize > ctrl->mem_base + ctrl->mem_size)
return -EINVAL; return -EINVAL;