From df47b246ed176b504b1d50ad63aa5a3bf7551f82 Mon Sep 17 00:00:00 2001 From: Colin Ian King Date: Fri, 14 Jul 2017 14:37:12 +0100 Subject: HID: logitech-hidpp: fix mistake in printk, "feeback" -> "feedback" Trivial fix to spelling mistake in hid_info message and add line break to split an overly long line to clean up a checkpatch warning. Signed-off-by: Colin Ian King Acked-By: Benjamin Tissoires Signed-off-by: Jiri Kosina --- drivers/hid/hid-logitech-hidpp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'drivers') diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-logitech-hidpp.c index 614054af904a..19cc980eebce 100644 --- a/drivers/hid/hid-logitech-hidpp.c +++ b/drivers/hid/hid-logitech-hidpp.c @@ -1957,7 +1957,8 @@ static int hidpp_ff_init(struct hidpp_device *hidpp, u8 feature_index) /* initialize with zero autocenter to get wheel in usable state */ hidpp_ff_set_autocenter(dev, 0); - hid_info(hid, "Force feeback support loaded (firmware release %d).\n", version); + hid_info(hid, "Force feedback support loaded (firmware release %d).\n", + version); return 0; } -- cgit v1.2.3 From f403f85f5334fb169d5c00deac106f140b62d3c9 Mon Sep 17 00:00:00 2001 From: Anton Vasilyev Date: Tue, 1 Aug 2017 16:25:59 +0300 Subject: misc: ibmasm: Return error on error path If ibmasm_event_buffer_init() or ibmasm_heartbeat_init() fails, then ibmasm_init_one() release all resources and return 0 on error path. The patch adds corresponding error for fails. Found by Linux Driver Verification project (linuxtesting.org). Signed-off-by: Anton Vasilyev Reviewed-by: Andy Shevchenko Signed-off-by: Jiri Kosina --- drivers/misc/ibmasm/event.c | 2 +- drivers/misc/ibmasm/module.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'drivers') 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; } -- cgit v1.2.3 From 83fc61a563cb4de3386ddc997cf8fc0ba55ec4ca Mon Sep 17 00:00:00 2001 From: Masanari Iida Date: Tue, 26 Sep 2017 12:47:59 +0900 Subject: treewide: Fix typos in Kconfig This patch fixes some spelling typos found in Kconfig files. Signed-off-by: Masanari Iida Acked-by: Randy Dunlap Signed-off-by: Jiri Kosina --- drivers/net/ethernet/aquantia/Kconfig | 2 +- drivers/nfc/st-nci/Kconfig | 4 ++-- drivers/nvdimm/Kconfig | 2 +- drivers/platform/x86/Kconfig | 2 +- drivers/power/supply/Kconfig | 2 +- drivers/scsi/Kconfig | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) (limited to 'drivers') diff --git a/drivers/net/ethernet/aquantia/Kconfig b/drivers/net/ethernet/aquantia/Kconfig index cdf78e069a39..7d623e90dc19 100644 --- a/drivers/net/ethernet/aquantia/Kconfig +++ b/drivers/net/ethernet/aquantia/Kconfig @@ -9,7 +9,7 @@ config NET_VENDOR_AQUANTIA Set this to y if you have an Ethernet network cards that uses the aQuantia AQC107/AQC108 chipset. - This option does not build any drivers; it casues the aQuantia + This option does not build any drivers; it causes the aQuantia drivers that can be built to appear in the list of Ethernet drivers. diff --git a/drivers/nfc/st-nci/Kconfig b/drivers/nfc/st-nci/Kconfig index dc9b777d78f6..5c6e21ccb19c 100644 --- a/drivers/nfc/st-nci/Kconfig +++ b/drivers/nfc/st-nci/Kconfig @@ -11,7 +11,7 @@ config NFC_ST_NCI_I2C select NFC_ST_NCI ---help--- This module adds support for an I2C interface to the - STMicroelectronics NFC NCI chips familly. + STMicroelectronics NFC NCI chips family. Select this if your platform is using the i2c bus. If you choose to build a module, it'll be called st-nci_i2c. @@ -23,7 +23,7 @@ config NFC_ST_NCI_SPI select NFC_ST_NCI ---help--- This module adds support for an SPI interface to the - STMicroelectronics NFC NCI chips familly. + STMicroelectronics NFC NCI chips family. Select this if your platform is using the spi bus. If you choose to build a module, it'll be called st-nci_spi. diff --git a/drivers/nvdimm/Kconfig b/drivers/nvdimm/Kconfig index 5bdd499b5f4f..a65f2e1d9f53 100644 --- a/drivers/nvdimm/Kconfig +++ b/drivers/nvdimm/Kconfig @@ -96,7 +96,7 @@ config NVDIMM_DAX help Support raw device dax access to a persistent memory namespace. For environments that want to hard partition - peristent memory, this capability provides a mechanism to + persistent memory, this capability provides a mechanism to sub-divide a namespace into character devices that can only be accessed via DAX (mmap(2)). diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index 80b87954f6dd..09dac11337d1 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -774,7 +774,7 @@ config TOSHIBA_WMI WARNING: This driver is incomplete as it lacks a proper keymap and the *notify function only prints the ACPI event type value. Be warned that you will need to provide some information if you have a Toshiba model - with WMI event hotkeys and want to help with the develpment of this + with WMI event hotkeys and want to help with the development of this driver. If you have a WMI-based hotkeys Toshiba laptop, say Y or M here. diff --git a/drivers/power/supply/Kconfig b/drivers/power/supply/Kconfig index 5ab90c1f3f7c..382669bf31f4 100644 --- a/drivers/power/supply/Kconfig +++ b/drivers/power/supply/Kconfig @@ -182,7 +182,7 @@ config CHARGER_SBS tristate "SBS Compliant charger" depends on I2C help - Say Y to include support for SBS compilant battery chargers. + Say Y to include support for SBS compliant battery chargers. config BATTERY_BQ27XXX tristate "BQ27xxx battery driver" diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig index 41366339b950..2b1cd3028749 100644 --- a/drivers/scsi/Kconfig +++ b/drivers/scsi/Kconfig @@ -786,7 +786,7 @@ config SCSI_IBMVSCSIS depends on PPC_PSERIES && TARGET_CORE && SCSI && PCI help This is the IBM POWER Virtual SCSI Target Server - This driver uses the SRP protocol for communication betwen servers + This driver uses the SRP protocol for communication between servers guest and/or the host that run on the same server. More information on VSCSI protocol can be found at www.power.org -- cgit v1.2.3