Merge tag 'char-misc-4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk...

[mirror_ubuntu-bionic-kernel.git] / drivers / parport / parport_ax88796.c

diff --git a/drivers/parport/parport_ax88796.c b/drivers/parport/parport_ax88796.c
index 8f8c9f3aa6910fe80ea92a9acdc905571518e540..2fc91edb058df94996df58ff2ad1ac4211e7586e 100644 (file)
--- a/drivers/parport/parport_ax88796.c
+++ b/drivers/parport/parport_ax88796.c
@@ -358,8 +358,7 @@ static int parport_ax88796_probe(struct platform_device *pdev)
  exit_unmap:
        iounmap(dd->base);
  exit_res:
-       release_resource(dd->io);
-       kfree(dd->io);
+       release_mem_region(dd->io->start, size);
  exit_mem:
        kfree(dd);
        return ret;
@@ -373,8 +372,7 @@ static int parport_ax88796_remove(struct platform_device *pdev)
        free_irq(p->irq, p);
        parport_remove_port(p);
        iounmap(dd->base);
-       release_resource(dd->io);
-       kfree(dd->io);
+       release_mem_region(dd->io->start, resource_size(dd->io));
        kfree(dd);
 
        return 0;