diff --git a/gas/config/tc-bpf.c b/gas/config/tc-bpf.c
index 45abc3c9578..b6b1db47427 100644
--- a/gas/config/tc-bpf.c
+++ b/gas/config/tc-bpf.c
@@ -1300,6 +1300,10 @@ parse_bpf_register (char *s, char rw, uint8_t *regno)
       s += 1;
     }
 
+  /* If we are still parsing a name, it is not a register.  */
+  if (is_part_of_name (*s))
+    return NULL;
+
   return s;
 }
 
diff --git a/gas/testsuite/gas/bpf/regs-for-symbols-pseudoc.s b/gas/testsuite/gas/bpf/regs-for-symbols-pseudoc.s
index 693787d5479..9b75f275285 100644
--- a/gas/testsuite/gas/bpf/regs-for-symbols-pseudoc.s
+++ b/gas/testsuite/gas/bpf/regs-for-symbols-pseudoc.s
@@ -2,3 +2,6 @@
         r2 = r3 ll
         r2 = r3+1 ll
         r2 = 1+r3 ll
+        r2 = r2d2 ll
+        r2 = r2d2+1 ll
+        r2 = 1+r2d2 ll