diff --git a/ChangeLog b/ChangeLog
index 75feef4..733083f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-13  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/openpgp-do.c (gpg_do_put_data): Add GPG_SUCCESS for
+	completeness (it worked because of lower layer goodness).
+
 2012-12-12  Niibe Yutaka  <gniibe@fsij.org>
 
 	* tool/gnuk_token.py: Add module imports.
diff --git a/src/openpgp-do.c b/src/openpgp-do.c
index 4194213..fa5625e 100644
--- a/src/openpgp-do.c
+++ b/src/openpgp-do.c
@@ -1381,8 +1381,11 @@ gpg_do_put_data (uint16_t tag, const uint8_t *data, int len)
 	      flash_do_release (*do_data_p);
 
 	    if (len == 0)
-	      /* make DO empty */
-	      *do_data_p = NULL;
+	      {
+		/* make DO empty */
+		*do_data_p = NULL;
+		GPG_SUCCESS ();
+	      }
 	    else if (len > 255)
 	      GPG_MEMORY_FAILURE ();
 	    else