diff options
Diffstat (limited to 'drivers/staging/nvec')
| -rw-r--r-- | drivers/staging/nvec/Kconfig | 10 | ||||
| -rw-r--r-- | drivers/staging/nvec/nvec.c | 8 | ||||
| -rw-r--r-- | drivers/staging/nvec/nvec_kbd.c | 2 |
3 files changed, 9 insertions, 11 deletions
diff --git a/drivers/staging/nvec/Kconfig b/drivers/staging/nvec/Kconfig index 5c12cacf75e1..9fa98c16f1d9 100644 --- a/drivers/staging/nvec/Kconfig +++ b/drivers/staging/nvec/Kconfig @@ -8,7 +8,7 @@ config MFD_NVEC controller. To compile this driver as a module, say M here: the module will be - called mfd-nvec + called mfd-nvec config KEYBOARD_NVEC tristate "Keyboard on nVidia compliant EC" @@ -18,7 +18,7 @@ config KEYBOARD_NVEC a nVidia compliant embedded controller. To compile this driver as a module, say M here: the module will be - called keyboard-nvec + called keyboard-nvec config SERIO_NVEC_PS2 tristate "PS2 on nVidia EC" @@ -28,7 +28,7 @@ config SERIO_NVEC_PS2 to a nVidia compliant embedded controller. To compile this driver as a module, say M here: the module will be - called serio-nvec-ps2 + called serio-nvec-ps2 config NVEC_POWER @@ -39,7 +39,7 @@ config NVEC_POWER nVidia compliant embedded controllers. To compile this driver as a module, say M here: the module will be - called nvec-power + called nvec-power config NVEC_PAZ00 @@ -50,5 +50,5 @@ config NVEC_PAZ00 devices, e.g. Toshbia AC100 and Dynabooks AZ netbooks. To compile this driver as a module, say M here: the module will be - called nvec-paz00 + called nvec-paz00 diff --git a/drivers/staging/nvec/nvec.c b/drivers/staging/nvec/nvec.c index 08027a36e0bc..360ec0407740 100644 --- a/drivers/staging/nvec/nvec.c +++ b/drivers/staging/nvec/nvec.c @@ -767,7 +767,6 @@ static int tegra_nvec_probe(struct platform_device *pdev) struct device *dev = &pdev->dev; struct nvec_chip *nvec; struct nvec_msg *msg; - struct resource *res; void __iomem *base; char get_firmware_version[] = { NVEC_CNTL, GET_FIRMWARE_VERSION }, unmute_speakers[] = { NVEC_OEM0, 0x10, 0x59, 0x95 }, @@ -790,16 +789,13 @@ static int tegra_nvec_probe(struct platform_device *pdev) return -ENODEV; } - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - base = devm_ioremap_resource(dev, res); + base = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(base)) return PTR_ERR(base); nvec->irq = platform_get_irq(pdev, 0); - if (nvec->irq < 0) { - dev_err(dev, "no irq resource?\n"); + if (nvec->irq < 0) return -ENODEV; - } i2c_clk = devm_clk_get(dev, "div-clk"); if (IS_ERR(i2c_clk)) { diff --git a/drivers/staging/nvec/nvec_kbd.c b/drivers/staging/nvec/nvec_kbd.c index 01dbb66f7e9a..386d619e3ee9 100644 --- a/drivers/staging/nvec/nvec_kbd.c +++ b/drivers/staging/nvec/nvec_kbd.c @@ -123,6 +123,8 @@ static int nvec_kbd_probe(struct platform_device *pdev) keycodes[j++] = extcode_tab_us102[i]; idev = devm_input_allocate_device(&pdev->dev); + if (!idev) + return -ENOMEM; idev->name = "nvec keyboard"; idev->phys = "nvec"; idev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REP) | BIT_MASK(EV_LED); |
