Merge branch 'ipvs'

[firefly-linux-kernel-4.4.55.git] / drivers / uio / uio.c

diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
index f7beb6eb40c714ae71309807b94b55a643501a9f..e371f5af11f5b91c16d183b90649f64005ad58a7 100644 (file)
--- a/drivers/uio/uio.c
+++ b/drivers/uio/uio.c
@@ -655,7 +655,7 @@ static int uio_mmap_physical(struct vm_area_struct *vma)
 
        if (mem->addr & ~PAGE_MASK)
                return -ENODEV;
-       if (vma->vm_end - vma->vm_start > mem->size)
+       if (vma->vm_end - vma->vm_start > PAGE_ALIGN(mem->size))
                return -EINVAL;
 
        vma->vm_ops = &uio_physical_vm_ops;
@@ -847,7 +847,7 @@ int __uio_register_device(struct module *owner,
        info->uio_dev = idev;
 
        if (info->irq && (info->irq != UIO_IRQ_CUSTOM)) {
-               ret = devm_request_irq(parent, info->irq, uio_interrupt,
+               ret = devm_request_irq(idev->dev, info->irq, uio_interrupt,
                                  info->irq_flags, info->name, idev);
                if (ret)
                        goto err_request_irq;