diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-12-07 00:39:39 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-12-07 00:39:39 +0300 |
| commit | d6eabce2577a695197e9433302fd6a9f0e1a7666 (patch) | |
| tree | e5c5bcc7803879d5d911cc8faeb74a946c242395 /drivers/misc/ibmasm/module.c | |
| parent | 6e948c67c47211afcc65c9ccdeedbd5db5c57077 (diff) | |
| parent | 328b4ed93b69a6f2083d52f31a240a09e5de386a (diff) | |
| download | linux-d6eabce2577a695197e9433302fd6a9f0e1a7666.tar.xz | |
Merge branch 'linus' into perf/urgent, to synchronize UAPI headers
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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; } |