diff --git a/libatomic/ChangeLog b/libatomic/ChangeLog
index 4f170244a2e3..ac46c3f28906 100644
--- a/libatomic/ChangeLog
+++ b/libatomic/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-22  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	PR other/53231
+	* tas_n.c (libat_test_and_set): Correct return.  Remove unused variable.
+
 2012-05-16  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* configure: Regenerated.
diff --git a/libatomic/tas_n.c b/libatomic/tas_n.c
index f137707f711f..faa8e2637946 100644
--- a/libatomic/tas_n.c
+++ b/libatomic/tas_n.c
@@ -85,7 +85,7 @@ SIZE(libat_test_and_set) (UTYPE *mptr, int smodel)
 bool
 SIZE(libat_test_and_set) (UTYPE *mptr, int smodel)
 {
-  UTYPE oldval, newval;
+  UTYPE oldval;
   UWORD magic;
 
   pre_seq_barrier (smodel);
@@ -97,7 +97,7 @@ SIZE(libat_test_and_set) (UTYPE *mptr, int smodel)
   protect_end (mptr, magic);
   post_seq_barrier (smodel);
 
-  return ret != 0;
+  return oldval != 0;
 }
 
 #define DONE 1