From: Quentin Lambert Date: Wed, 18 Mar 2015 13:21:08 +0000 (+0100) Subject: Staging: dgnc: release the lock before testing for nullity X-Git-Tag: v4.1-rc1~152^2~138^2~336 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5ec293650827122df300581c17ca1d5de03bac3d;p=karo-tx-linux.git Staging: dgnc: release the lock before testing for nullity The refactoring intrduced in c84a083b995b ("Staging: dgnc: Use goto for spinlock release before return") inverts the order in which the lock is released and ld is tested for nullity. This patch restores the execution flow. Fixes: c84a083b995b ("Staging: dgnc: Use goto for spinlock release before return") Signed-off-by: Quentin Lambert Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/dgnc/dgnc_tty.c b/drivers/staging/dgnc/dgnc_tty.c index 8445f84ddaa3..f1c4d07a0aaa 100644 --- a/drivers/staging/dgnc/dgnc_tty.c +++ b/drivers/staging/dgnc/dgnc_tty.c @@ -656,9 +656,9 @@ void dgnc_input(struct channel_t *ch) return; exit_unlock: + spin_unlock_irqrestore(&ch->ch_lock, flags); if (ld) tty_ldisc_deref(ld); - spin_unlock_irqrestore(&ch->ch_lock, flags); }