On Thu, May 1, 2014 at 7:49 PM, Mark Brown <[email protected]> wrote:
> From: Mark Brown <[email protected]>
>
> If we fail to create the master queue for some reason we should not attempt
> to clean it up since attempting to stop a kthread that was not created will
> hang and it's just generally bad practice. Unfortunately at present we call
> spi_destroy_queue() even in cases where the creation fails.
>
> Fix this by fixing the error handling in spi_master_initialize_queue() so
> that we only flag the master as queued or destroy the queue if creation
> succeeded. The change to the flag is done since the general master
> cleanup uses this to destroy the queue.
>
> Reported-by: Ricardo Ribalda Delgado <[email protected]>
> Signed-off-by: Mark Brown <[email protected]>
> ---
>
> This has been compile tested only but it should hopefully be more robust
> in the long term than just skipping the queue deletion inside the
> destructor.
>
> drivers/spi/spi.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
> index 38ba75a..bc42e27 100644
> --- a/drivers/spi/spi.c
> +++ b/drivers/spi/spi.c
> @@ -1151,7 +1151,6 @@ static int spi_master_initialize_queue(struct
> spi_master *master)
> {
> int ret;
>
> - master->queued = true;
> master->transfer = spi_queued_transfer;
> if (!master->transfer_one_message)
> master->transfer_one_message = spi_transfer_one_message;
> @@ -1162,6 +1161,7 @@ static int spi_master_initialize_queue(struct
> spi_master *master)
> dev_err(&master->dev, "problem initializing queue\n");
> goto err_init_queue;
You can just "return ret;" here...
> }
> + master->queued = true;
> ret = spi_start_queue(master);
> if (ret) {
> dev_err(&master->dev, "problem starting queue\n");
> @@ -1171,8 +1171,8 @@ static int spi_master_initialize_queue(struct
> spi_master *master)
> return 0;
>
> err_start_queue:
> -err_init_queue:
> spi_destroy_queue(master);
> +err_init_queue:
... and kill the err_init_queue label.
> return ret;
> }
Apart from that:
Acked-by: Geert Uytterhoeven <[email protected]>
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
