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

Commit 542ef8a6 authored by Matei Oprea's avatar Matei Oprea Committed by Greg Kroah-Hartman
Browse files

staging: cxt1e1: hwprobe: fix incorrect type in assignment 



This patch fixes "incorrect type in argument 1" warning from sparse.

Signed-off-by: default avatarMatei Oprea <eu@opreamatei.ro>
Cc: ROSEdu Kernel Community <firefly@lists.rosedu.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ea143c4f

drivers/staging/cxt1e1/hwprobe.c

+3 −3
Original line number Diff line number Diff line
@@ -174,12 +174,12 @@ cleanup_ioremap(void) 
		if (hi->pci_slot == 0xff)

			break;

		if (hi->addr_mapped[0]) {

			iounmap((void *)(hi->addr_mapped[0]));

			iounmap(hi->addr_mapped[0]);

			release_mem_region((long) hi->addr[0], hi->len[0]);

			hi->addr_mapped[0] = 0;

		}

		if (hi->addr_mapped[1]) {

			iounmap((void *)(hi->addr_mapped[1]));

			iounmap(hi->addr_mapped[1]);

			release_mem_region((long) hi->addr[1], hi->len[1]);

			hi->addr_mapped[1] = 0;

		}
@@ -329,7 +329,7 @@ c4hw_attach_all(void) 
				return -ENOMEM;

			}



			hi->addr_mapped[j] = (unsigned long)ioremap(hi->addr[j], hi->len[j]);

			hi->addr_mapped[j] = ioremap(hi->addr[j], hi->len[j]);

			if (!hi->addr_mapped[j]) {

				pr_warning("%s: ioremap fails, addr=0x%lx, len=0x%lx ?\n",

					   hi->devname, hi->addr[j], hi->len[j]);

drivers/staging/cxt1e1/pmcc4_private.h

+1 −1
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ struct s_hdw_info 
    struct pci_dev *pdev[2];



    unsigned long addr[2];

    unsigned long addr_mapped[2];

    void __iomem *addr_mapped[2];

    unsigned long len[2];



    union