diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-07-27 23:14:08 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-07-27 23:14:08 +0200 |
| commit | f6248dd88dba3aeb19351410a027d92eee7ceb72 (patch) | |
| tree | 9dfe33ca030186ffd5007784d0647a8306d41be9 /drivers/scsi/qedi/qedi_fw.c | |
| parent | ACPI / PM / EC: Flush all EC work in acpi_freeze_sync() (diff) | |
| parent | ACPI: NUMA: Fix typo in the full name of SRAT (diff) | |
| download | linux-dev-f6248dd88dba3aeb19351410a027d92eee7ceb72.tar.xz linux-dev-f6248dd88dba3aeb19351410a027d92eee7ceb72.zip | |
Merge branches 'acpi-pm' and 'acpi-numa'
* acpi-pm:
ACPI / PM / EC: Flush all EC work in acpi_freeze_sync()
ACPI / EC: Add parameter to force disable the GPE on suspend
* acpi-numa:
ACPI: NUMA: Fix typo in the full name of SRAT
ACPI: NUMA: add missing include in acpi_numa.h
Diffstat (limited to 'drivers/scsi/qedi/qedi_fw.c')
| -rw-r--r-- | drivers/scsi/qedi/qedi_fw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/qedi/qedi_fw.c b/drivers/scsi/qedi/qedi_fw.c index 19254bd739d9..93d54acd4a22 100644 --- a/drivers/scsi/qedi/qedi_fw.c +++ b/drivers/scsi/qedi/qedi_fw.c @@ -1411,7 +1411,7 @@ static void qedi_tmf_work(struct work_struct *work) list_work = kzalloc(sizeof(*list_work), GFP_ATOMIC); if (!list_work) { - QEDI_ERR(&qedi->dbg_ctx, "Memory alloction failed\n"); + QEDI_ERR(&qedi->dbg_ctx, "Memory allocation failed\n"); goto abort_ret; } |