Commit 75e5bae6 authored by Pan Bian's avatar Pan Bian Committed by Greg Kroah-Hartman

firmware: vpd: use memunmap instead of iounmap

In functions vpd_sections_init() and vpd_section_init(), iounmap() is
used to unmap memory. However, in these cases, memunmap() should be
used.
Signed-off-by: default avatarPan Bian <bianpan2016@163.com>
Reviewed-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e41e164c
...@@ -202,7 +202,7 @@ static int vpd_section_init(const char *name, struct vpd_section *sec, ...@@ -202,7 +202,7 @@ static int vpd_section_init(const char *name, struct vpd_section *sec,
sec->raw_name = kasprintf(GFP_KERNEL, "%s_raw", name); sec->raw_name = kasprintf(GFP_KERNEL, "%s_raw", name);
if (!sec->raw_name) { if (!sec->raw_name) {
err = -ENOMEM; err = -ENOMEM;
goto err_iounmap; goto err_memunmap;
} }
sysfs_bin_attr_init(&sec->bin_attr); sysfs_bin_attr_init(&sec->bin_attr);
...@@ -233,8 +233,8 @@ static int vpd_section_init(const char *name, struct vpd_section *sec, ...@@ -233,8 +233,8 @@ static int vpd_section_init(const char *name, struct vpd_section *sec,
sysfs_remove_bin_file(vpd_kobj, &sec->bin_attr); sysfs_remove_bin_file(vpd_kobj, &sec->bin_attr);
err_free_raw_name: err_free_raw_name:
kfree(sec->raw_name); kfree(sec->raw_name);
err_iounmap: err_memunmap:
iounmap(sec->baseaddr); memunmap(sec->baseaddr);
return err; return err;
} }
...@@ -245,7 +245,7 @@ static int vpd_section_destroy(struct vpd_section *sec) ...@@ -245,7 +245,7 @@ static int vpd_section_destroy(struct vpd_section *sec)
kobject_put(sec->kobj); kobject_put(sec->kobj);
sysfs_remove_bin_file(vpd_kobj, &sec->bin_attr); sysfs_remove_bin_file(vpd_kobj, &sec->bin_attr);
kfree(sec->raw_name); kfree(sec->raw_name);
iounmap(sec->baseaddr); memunmap(sec->baseaddr);
} }
return 0; return 0;
...@@ -262,7 +262,7 @@ static int vpd_sections_init(phys_addr_t physaddr) ...@@ -262,7 +262,7 @@ static int vpd_sections_init(phys_addr_t physaddr)
return -ENOMEM; return -ENOMEM;
memcpy_fromio(&header, temp, sizeof(struct vpd_cbmem)); memcpy_fromio(&header, temp, sizeof(struct vpd_cbmem));
iounmap(temp); memunmap(temp);
if (header.magic != VPD_CBMEM_MAGIC) if (header.magic != VPD_CBMEM_MAGIC)
return -ENODEV; return -ENODEV;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment