summaryrefslogtreecommitdiffstats
path: root/drivers/firmware
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-09-05 14:08:17 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2017-09-05 14:08:17 -0400
commitbafb0762cb6a906eb4105cccfb3bcd90be7f40d2 (patch)
tree14ecb87c33bcf909e5b95c27cd694ded4ac1478c /drivers/firmware
parent44b1671fae88ce95b8c7b53acbc6ba71ca67db00 (diff)
parent3a6430ce462172caac7c73f4afd550ab0f105737 (diff)
Merge tag 'char-misc-4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull char/misc driver updates from Greg KH: "Here is the big char/misc driver update for 4.14-rc1. Lots of different stuff in here, it's been an active development cycle for some reason. Highlights are: - updated binder driver, this brings binder up to date with what shipped in the Android O release, plus some more changes that happened since then that are in the Android development trees. - coresight updates and fixes - mux driver file renames to be a bit "nicer" - intel_th driver updates - normal set of hyper-v updates and changes - small fpga subsystem and driver updates - lots of const code changes all over the driver trees - extcon driver updates - fmc driver subsystem upadates - w1 subsystem minor reworks and new features and drivers added - spmi driver updates Plus a smattering of other minor driver updates and fixes. All of these have been in linux-next with no reported issues for a while" * tag 'char-misc-4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (244 commits) ANDROID: binder: don't queue async transactions to thread. ANDROID: binder: don't enqueue death notifications to thread todo. ANDROID: binder: Don't BUG_ON(!spin_is_locked()). ANDROID: binder: Add BINDER_GET_NODE_DEBUG_INFO ioctl ANDROID: binder: push new transactions to waiting threads. ANDROID: binder: remove proc waitqueue android: binder: Add page usage in binder stats android: binder: fixup crash introduced by moving buffer hdr drivers: w1: add hwmon temp support for w1_therm drivers: w1: refactor w1_slave_show to make the temp reading functionality separate drivers: w1: add hwmon support structures eeprom: idt_89hpesx: Support both ACPI and OF probing mcb: Fix an error handling path in 'chameleon_parse_cells()' MCB: add support for SC31 to mcb-lpc mux: make device_type const char: virtio: constify attribute_group structures. Documentation/ABI: document the nvmem sysfs files lkdtm: fix spelling mistake: "incremeted" -> "incremented" perf: cs-etm: Fix ETMv4 CONFIGR entry in perf.data file nvmem: include linux/err.h from header ...
Diffstat (limited to 'drivers/firmware')
-rw-r--r--drivers/firmware/google/vpd.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/firmware/google/vpd.c b/drivers/firmware/google/vpd.c
index 78945729388e..35e553b3b190 100644
--- a/drivers/firmware/google/vpd.c
+++ b/drivers/firmware/google/vpd.c
@@ -202,7 +202,7 @@ static int vpd_section_init(const char *name, struct vpd_section *sec,
202 sec->raw_name = kasprintf(GFP_KERNEL, "%s_raw", name); 202 sec->raw_name = kasprintf(GFP_KERNEL, "%s_raw", name);
203 if (!sec->raw_name) { 203 if (!sec->raw_name) {
204 err = -ENOMEM; 204 err = -ENOMEM;
205 goto err_iounmap; 205 goto err_memunmap;
206 } 206 }
207 207
208 sysfs_bin_attr_init(&sec->bin_attr); 208 sysfs_bin_attr_init(&sec->bin_attr);
@@ -233,8 +233,8 @@ err_sysfs_remove:
233 sysfs_remove_bin_file(vpd_kobj, &sec->bin_attr); 233 sysfs_remove_bin_file(vpd_kobj, &sec->bin_attr);
234err_free_raw_name: 234err_free_raw_name:
235 kfree(sec->raw_name); 235 kfree(sec->raw_name);
236err_iounmap: 236err_memunmap:
237 iounmap(sec->baseaddr); 237 memunmap(sec->baseaddr);
238 return err; 238 return err;
239} 239}
240 240
@@ -245,7 +245,7 @@ static int vpd_section_destroy(struct vpd_section *sec)
245 kobject_put(sec->kobj); 245 kobject_put(sec->kobj);
246 sysfs_remove_bin_file(vpd_kobj, &sec->bin_attr); 246 sysfs_remove_bin_file(vpd_kobj, &sec->bin_attr);
247 kfree(sec->raw_name); 247 kfree(sec->raw_name);
248 iounmap(sec->baseaddr); 248 memunmap(sec->baseaddr);
249 } 249 }
250 250
251 return 0; 251 return 0;
@@ -262,7 +262,7 @@ static int vpd_sections_init(phys_addr_t physaddr)
262 return -ENOMEM; 262 return -ENOMEM;
263 263
264 memcpy_fromio(&header, temp, sizeof(struct vpd_cbmem)); 264 memcpy_fromio(&header, temp, sizeof(struct vpd_cbmem));
265 iounmap(temp); 265 memunmap(temp);
266 266
267 if (header.magic != VPD_CBMEM_MAGIC) 267 if (header.magic != VPD_CBMEM_MAGIC)
268 return -ENODEV; 268 return -ENODEV;