2 files changed, 3 insertions, 8 deletions

diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index e7b5350b65ce..84e21201f3c0 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -245,7 +245,7 @@ static int do_ccw_entry(const char *filename,
             id->cu_model);
         ADD(alias, "dt", id->match_flags&CCW_DEVICE_ID_MATCH_DEVICE_TYPE,
             id->dev_type);
-        ADD(alias, "dm", id->match_flags&CCW_DEVICE_ID_MATCH_DEVICE_TYPE,
+        ADD(alias, "dm", id->match_flags&CCW_DEVICE_ID_MATCH_DEVICE_MODEL,
             id->dev_model);
         return 1;
 }
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 30f3ac8eb43c..0b92ddff26fd 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -923,19 +923,14 @@ void __attribute__((format(printf, 2, 3))) buf_printf(struct buffer *buf,
 
         va_start(ap, fmt);
         len = vsnprintf(tmp, SZ, fmt, ap);
-        if (buf->size - buf->pos < len + 1) {
-                buf->size += 128;
-                buf->p = realloc(buf->p, buf->size);
-        }
-        strncpy(buf->p + buf->pos, tmp, len + 1);
-        buf->pos += len;
+        buf_write(buf, tmp, len);
         va_end(ap);
 }
 
 void buf_write(struct buffer *buf, const char *s, int len)
 {
         if (buf->size - buf->pos < len) {
-                buf->size += len;
+                buf->size += len + SZ;
                 buf->p = realloc(buf->p, buf->size);
         }
         strncpy(buf->p + buf->pos, s, len);