Commit 67eeede3 authored by Jean-Jacques Hiblot's avatar Jean-Jacques Hiblot
Browse files

mfd: ti_am335x_tscadc: Fix merge issue



Commit e823ec6f removed the udelay in the interrupt handler.
But a merge error occurred when it got merged by pulling v3.14.24, which
can lead to a task lock-up.
This commit fixes the merge error.

Signed-off-by: default avatarJean-Jacques Hiblot <jjhiblot@ti.com>
parent 4818f775
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment