diff --git a/[refs] b/[refs] index 778debdcc5a2..6d0ac0936c94 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b55fa18817743c3c4aef14f0c6fc0e21d7bc1e62 +refs/heads/master: ee3f615819404a9438b2dd01b7a39f276d2737f2 diff --git a/trunk/arch/arm/common/pl330.c b/trunk/arch/arm/common/pl330.c index 97912fa48782..7129cfbdacd6 100644 --- a/trunk/arch/arm/common/pl330.c +++ b/trunk/arch/arm/common/pl330.c @@ -1546,7 +1546,7 @@ int pl330_chan_ctrl(void *ch_id, enum pl330_chan_op op) /* Start the next */ case PL330_OP_START: - if (!_start(thrd)) + if (!_thrd_active(thrd) && !_start(thrd)) ret = -EIO; break;