fix error path

Change-Id: I410a6c1f19dfe316d198c2d02e4dc09b007be201
Merge branch 'jb-mr1_mkt' of git://github.com/MoKee/android_vendor_motorola_edison into jb-mr1