diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index b8e669567d9c..9072352545aa 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -372,6 +372,7 @@ abort:
 		put_task_struct(oc->chosen_non_negative_adj);
 	if (oc->chosen)
 		put_task_struct(oc->chosen);
+	oc->chosen_non_negative_adj = NULL;
 	oc->chosen = (void *)-1UL;
 	return 1;
 }
@@ -404,8 +405,7 @@ static void select_bad_process(struct oom_control *oc)
 		 * a postive ADJ to kill, kill the task with the positive ADJ
 		 * instead.
 		 */
-		if (oc->chosen && oc->chosen != (void *)-1UL &&
-		    oc->chosen->signal->oom_score_adj < 0) {
+		if (oc->chosen && oc->chosen->signal->oom_score_adj < 0) {
 			put_task_struct(oc->chosen);
 			oc->chosen = oc->chosen_non_negative_adj;
 			oc->chosen_points = oc->chosen_non_negative_adj_points;