Revert "gpio: mxc: Unlock on error path in mxc_flip_edge()"
This reverts commit 621f296f11 which is
commit 37870358616ca7fdb1e90ad1cdd791655ec54414 upstream.
It needs to be reverted, as a later commit breaks the ABI and that is
not needed in the Android kernel tree.
Bug: 161946584
Change-Id: Ibec377e5d83f554f1dce645b8b43197acbd4036a
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
@@ -236,11 +236,10 @@ static void mxc_flip_edge(struct mxc_gpio_port *port, u32 gpio)
|
||||
} else {
|
||||
pr_err("mxc: invalid configuration for GPIO %d: %x\n",
|
||||
gpio, edge);
|
||||
goto unlock;
|
||||
return;
|
||||
}
|
||||
writel(val | (edge << (bit << 1)), reg);
|
||||
|
||||
unlock:
|
||||
raw_spin_unlock_irqrestore(&port->gc.bgpio_lock, flags);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user