From: Mark A. Greer <mgreer@animalcreek.com>
Date: Tue, 2 Sep 2014 22:12:43 +0000 (-0700)
Subject: NFC: trf7970a: Cancel timer when error encountered
X-Git-Tag: omap-for-v3.19/prcm-cleanup~141^2~39^2~72^2~38
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6fb9edcb43d0b1bf0ac2aaf6ba488d105c45f477;p=pandora-kernel.git

NFC: trf7970a: Cancel timer when error encountered

Some paths leave a timer still running when
trf7970a_send_err_upstream() is called.  This
can cause a timeout to occur in a subsequent
transaction making it fail.  Fix this by ensuring
there is no timer running before sending an error
upstream.

Signed-off-by: Mark A. Greer <mgreer@animalcreek.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
---

Reading git-diff-tree failed