atavia: Fix a few problems overlooked/introduced while rebasing.

Signed-off-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
Acked-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>

git-svn-id: svn://flashrom.org/flashrom/trunk@1811 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1