Injection (1/2): Fix negative (-1) channel

Proposed by nieldk at http://talk.maemo.org/showpost.php?p=1387059&postcount=175
Injection (2/2): Speedup injection

Patch proposed by nieldk at http://talk.maemo.org/showpost.php?p=1387059&postcount=175