diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index efd3d79e56d..3ff6a9bf254 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2012-09-17  Georg-Johann Lay  <avr@gjlay.de>
+
+	PR target/54222
+	* config/avr/avr.c (avr_out_plus_symbol): Fix typo if PLUS and PSImode.
+	(avr_out_plus_1): Remove log comments from assembler output.
+
 2012-09-17  Ruben Buchatskiy  <ruben@ispras.ru>
 
 	* config/arm/vfp.md (*thumb2_movdf_vfp): Require one of the operands
diff --git a/gcc/config/avr/avr.c b/gcc/config/avr/avr.c
index c46f488603f..b1bd6d6d751 100644
--- a/gcc/config/avr/avr.c
+++ b/gcc/config/avr/avr.c
@@ -6268,9 +6268,6 @@ avr_out_plus_1 (rtx *xop, int *plen, enum rtx_code code, int *pcc,
     ? simplify_gen_subreg (QImode, xop[0], mode, n_bytes-2)
     : NULL_RTX;
 
-  if (!plen && flag_print_asm_name)
-    avr_fdump (asm_out_file, ";; %C (%C)\n", code_sat, code);
-
   bool need_copy = true;
   int len_call = 1 + AVR_HAVE_JMP_CALL;
   
@@ -6281,9 +6278,6 @@ avr_out_plus_1 (rtx *xop, int *plen, enum rtx_code code, int *pcc,
 
     case SS_PLUS:
     case SS_MINUS:
-      if (!plen && flag_print_asm_name)
-        avr_fdump (asm_out_file, ";; %s = %r\n", sign < 0 ? "neg" : "pos",
-                   xop[2]);
 
       if (out_brvc)
         avr_asm_len ("brvc 0f", op, plen, 1);
@@ -6463,7 +6457,6 @@ static const char*
 avr_out_plus_symbol (rtx *xop, enum rtx_code code, int *plen, int *pcc)
 {
   enum machine_mode mode = GET_MODE (xop[0]);
-  int n_bytes = GET_MODE_SIZE (mode);
 
   /* Only pointer modes want to add symbols.  */
   
@@ -6476,9 +6469,9 @@ avr_out_plus_symbol (rtx *xop, enum rtx_code code, int *plen, int *pcc)
                : "subi %A0,lo8(%2)"    CR_TAB "sbci %B0,hi8(%2)",
                xop, plen, -2);
 
-  if (3 == n_bytes)
+  if (PSImode == mode)
     avr_asm_len (PLUS == code
-                 ? "sbci %C0,hlo8((-%2))"
+                 ? "sbci %C0,hlo8(-(%2))"
                  : "sbci %C0,hlo8(%2)", xop, plen, 1);
   return "";
 }