diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-15 10:14:11 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-15 10:14:11 -0800 |
| commit | 9682b3dea22190a6fd449d157e3175b0e748684d (patch) | |
| tree | 1b4d01168142fbb006e16b40e669de9737eb69ee /drivers/misc | |
| parent | 20df15783a44a289aaa8c8f83b3f715f9040c9c2 (diff) | |
| parent | 1972d6c0c86dd8620ff9f2811ce875135ffb5405 (diff) | |
Merge branch 'for-linus' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina:
"The usual rocket-science from trivial tree for 4.15"
* 'for-linus' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
MAINTAINERS: relinquish kconfig
MAINTAINERS: Update my email address
treewide: Fix typos in Kconfig
kfifo: Fix comments
init/Kconfig: Fix module signing document location
misc: ibmasm: Return error on error path
HID: logitech-hidpp: fix mistake in printk, "feeback" -> "feedback"
MAINTAINERS: Correct path to uDraw PS3 driver
tracing: Fix doc mistakes in trace sample
tracing: Kconfig text fixes for CONFIG_HWLAT_TRACER
MIPS: Alchemy: Remove reverted CONFIG_NETLINK_MMAP from db1xxx_defconfig
mm/huge_memory.c: fixup grammar in comment
lib/xz: Add fall-through comments to a switch statement
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/ibmasm/event.c | 2 | ||||
| -rw-r--r-- | drivers/misc/ibmasm/module.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/drivers/misc/ibmasm/event.c b/drivers/misc/ibmasm/event.c index 8e540f4e9d52..7e33025b4854 100644 --- a/drivers/misc/ibmasm/event.c +++ b/drivers/misc/ibmasm/event.c @@ -155,7 +155,7 @@ int ibmasm_event_buffer_init(struct service_processor *sp) buffer = kmalloc(sizeof(struct event_buffer), GFP_KERNEL); if (!buffer) - return 1; + return -ENOMEM; buffer->next_index = 0; buffer->next_serial_number = 1; diff --git a/drivers/misc/ibmasm/module.c b/drivers/misc/ibmasm/module.c index c5a456b0a564..e914b8c80943 100644 --- a/drivers/misc/ibmasm/module.c +++ b/drivers/misc/ibmasm/module.c @@ -94,12 +94,14 @@ static int ibmasm_init_one(struct pci_dev *pdev, const struct pci_device_id *id) snprintf(sp->dirname, IBMASM_NAME_SIZE, "%d", sp->number); snprintf(sp->devname, IBMASM_NAME_SIZE, "%s%d", DRIVER_NAME, sp->number); - if (ibmasm_event_buffer_init(sp)) { + result = ibmasm_event_buffer_init(sp); + if (result) { dev_err(sp->dev, "Failed to allocate event buffer\n"); goto error_eventbuffer; } - if (ibmasm_heartbeat_init(sp)) { + result = ibmasm_heartbeat_init(sp); + if (result) { dev_err(sp->dev, "Failed to allocate heartbeat command\n"); goto error_heartbeat; } |