summaryrefslogtreecommitdiff
path: root/py/vm.c
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2014-03-31 16:28:58 +0100
committerDamien George <damien.p.george@gmail.com>2014-03-31 16:28:58 +0100
commit43e92cfb521db55fb2d0001388c0e3a532405b50 (patch)
treee7f69bc029e9236a3adfdc228bdaa62102491b82 /py/vm.c
parent15d18069c50f7c02cb71417f3c4ffddff335fe70 (diff)
parente566670153adc1d995206eaf3a9e606000a789d4 (diff)
Merge branch 'master' of github.com:micropython/micropython
Diffstat (limited to 'py/vm.c')
-rw-r--r--py/vm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/py/vm.c b/py/vm.c
index 8aec2e1ce..69f350f9f 100644
--- a/py/vm.c
+++ b/py/vm.c
@@ -769,7 +769,7 @@ yield:
if (inject_exc != MP_OBJ_NULL) {
t_exc = inject_exc;
inject_exc = MP_OBJ_NULL;
- ret_kind = mp_resume(TOP(), mp_const_none, t_exc, &obj2);
+ ret_kind = mp_resume(TOP(), MP_OBJ_NULL, t_exc, &obj2);
} else {
ret_kind = mp_resume(TOP(), obj1, MP_OBJ_NULL, &obj2);
}