diff options
| author | James Morris <[email protected]> | 2017-12-11 06:01:08 +0000 |
|---|---|---|
| committer | James Morris <[email protected]> | 2017-12-11 06:01:08 +0000 |
| commit | d21bd6898336a7892914d308d5e0868f0b863571 (patch) | |
| tree | f5f756c25348b5a6c1ce9ddbaa7d1ecd1bef40b0 /drivers/misc/ibmasm/module.c | |
| parent | MAINTAINERS: update the IMA, EVM, trusted-keys, encrypted-keys entries (diff) | |
| parent | Linux 4.15-rc3 (diff) | |
| download | kernel-d21bd6898336a7892914d308d5e0868f0b863571.tar.gz kernel-d21bd6898336a7892914d308d5e0868f0b863571.zip | |
Sync to v4.15-rc3 for security subsystem developers to work against.
Diffstat (limited to 'drivers/misc/ibmasm/module.c')
| -rw-r--r-- | drivers/misc/ibmasm/module.c | 6 |
1 files changed, 4 insertions, 2 deletions
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; } |