From a7314ee4ec6c926185cfc0e1aadc0ce54182a5b9 Mon Sep 17 00:00:00 2001 From: Ken Mills Date: Mon, 13 Dec 2010 15:28:03 +0000 Subject: [PATCH] --- yaml --- r: 223500 b: refs/heads/master c: 093d804611b9a38fe59753b37c29f840518406a9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/tty/n_gsm.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index de7d76b15cdc..ab7b7daa4bbc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: be7a7411d63ccad165d66fe8e0b11b2ee336159b +refs/heads/master: 093d804611b9a38fe59753b37c29f840518406a9 diff --git a/trunk/drivers/tty/n_gsm.c b/trunk/drivers/tty/n_gsm.c index 2fc5cf27152a..c5f8e5bda2b2 100644 --- a/trunk/drivers/tty/n_gsm.c +++ b/trunk/drivers/tty/n_gsm.c @@ -968,6 +968,8 @@ static void gsm_control_reply(struct gsm_mux *gsm, int cmd, u8 *data, { struct gsm_msg *msg; msg = gsm_data_alloc(gsm, 0, dlen + 2, gsm->ftype); + if (msg == NULL) + return; msg->data[0] = (cmd & 0xFE) << 1 | EA; /* Clear C/R */ msg->data[1] = (dlen << 1) | EA; memcpy(msg->data + 2, data, dlen);