diff options
| author | popcornmix <popcornmix@gmail.com> | 2019-05-21 14:11:57 +0100 |
|---|---|---|
| committer | popcornmix <popcornmix@gmail.com> | 2019-05-21 14:11:57 +0100 |
| commit | 2b1a992899f708567f69c052ae2768c215b22d5d (patch) | |
| tree | fb776d19600624e5a78bc19b3ce0209e88480cdc /drivers/input | |
| parent | 33b883a459e2cf59f0d84a9148b269ab6a07bbf3 (diff) | |
| parent | dafc674bbcb11c6a5c63b75be5873b118e2add17 (diff) | |
| download | linux-rpi3-2b1a992899f708567f69c052ae2768c215b22d5d.tar.gz linux-rpi3-2b1a992899f708567f69c052ae2768c215b22d5d.tar.bz2 linux-rpi3-2b1a992899f708567f69c052ae2768c215b22d5d.zip | |
Merge remote-tracking branch 'stable/linux-4.19.y' into rpi-4.19.y
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/rmi4/rmi_driver.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/input/rmi4/rmi_driver.c b/drivers/input/rmi4/rmi_driver.c index fc3ab93b7aea..7fb358f96195 100644 --- a/drivers/input/rmi4/rmi_driver.c +++ b/drivers/input/rmi4/rmi_driver.c @@ -860,7 +860,7 @@ static int rmi_create_function(struct rmi_device *rmi_dev, error = rmi_register_function(fn); if (error) - goto err_put_fn; + return error; if (pdt->function_number == 0x01) data->f01_container = fn; @@ -870,10 +870,6 @@ static int rmi_create_function(struct rmi_device *rmi_dev, list_add_tail(&fn->node, &data->function_list); return RMI_SCAN_CONTINUE; - -err_put_fn: - put_device(&fn->dev); - return error; } void rmi_enable_irq(struct rmi_device *rmi_dev, bool clear_wake) |