mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-30 22:26:55 +00:00
serial: sc16is7xx: remove obsolete out_thread label
[ Upstream commitdabc54a457
] Commitc8f71b49ee
("serial: sc16is7xx: setup GPIO controller later in probe") moved GPIO setup code later in probe function. Doing so also required to move ports cleanup code (out_ports label) after the GPIO cleanup code. After these moves, the out_thread label becomes misplaced and makes part of the cleanup code illogical. This patch remove the now obsolete out_thread label and make GPIO setup code jump to out_ports label if it fails. Signed-off-by: Hugo Villeneuve <hvilleneuve@dimonoff.com> Reviewed-by: Lech Perczak <lech.perczak@camlingroup.com> Tested-by: Lech Perczak <lech.perczak@camlingroup.com> Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com> Link: https://lore.kernel.org/r/20230807214556.540627-3-hugo@hugovil.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Stable-dep-of:0499942928
("serial: sc16is7xx: fix regression with GPIO configuration") Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
cb3acdc203
commit
ccae7cf2d6
1 changed files with 1 additions and 3 deletions
|
@ -1529,7 +1529,7 @@ static int sc16is7xx_probe(struct device *dev,
|
|||
s->gpio.can_sleep = 1;
|
||||
ret = gpiochip_add_data(&s->gpio, s);
|
||||
if (ret)
|
||||
goto out_thread;
|
||||
goto out_ports;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
@ -1555,8 +1555,6 @@ static int sc16is7xx_probe(struct device *dev,
|
|||
#ifdef CONFIG_GPIOLIB
|
||||
if (devtype->nr_gpio)
|
||||
gpiochip_remove(&s->gpio);
|
||||
|
||||
out_thread:
|
||||
#endif
|
||||
|
||||
out_ports:
|
||||
|
|
Loading…
Reference in a new issue