From 0fbae8874eea124591aee10efae98d244a2d072d Mon Sep 17 00:00:00 2001 From: Alexander Shiyan Date: Mon, 10 Feb 2014 22:18:33 +0400 Subject: serial: max310x: Add missing mutex_destroy() on driver exit Signed-off-by: Alexander Shiyan Signed-off-by: Greg Kroah-Hartman --- drivers/tty/serial/max310x.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'drivers/tty') diff --git a/drivers/tty/serial/max310x.c b/drivers/tty/serial/max310x.c index 2a12cbcbf388..c180576546ed 100644 --- a/drivers/tty/serial/max310x.c +++ b/drivers/tty/serial/max310x.c @@ -1134,8 +1134,6 @@ static int max310x_probe(struct device *dev, struct max310x_devtype *devtype, s->devtype = devtype; dev_set_drvdata(dev, s); - mutex_init(&s->mutex); - /* Check device to ensure we are talking to what we expect */ ret = devtype->detect(dev); if (ret) @@ -1193,6 +1191,8 @@ static int max310x_probe(struct device *dev, struct max310x_devtype *devtype, goto out_uart; #endif + mutex_init(&s->mutex); + for (i = 0; i < devtype->nr; i++) { /* Initialize port data */ s->p[i].port.line = i; @@ -1233,6 +1233,8 @@ static int max310x_probe(struct device *dev, struct max310x_devtype *devtype, dev_err(dev, "Unable to reguest IRQ %i\n", irq); + mutex_destroy(&s->mutex); + #ifdef CONFIG_GPIOLIB WARN_ON(gpiochip_remove(&s->gpio)); #endif @@ -1264,6 +1266,7 @@ static int max310x_remove(struct device *dev) s->devtype->power(&s->p[i].port, 0); } + mutex_destroy(&s->mutex); uart_unregister_driver(&s->uart); clk_disable_unprepare(s->clk); -- cgit v1.2.3