Merge commit 'v2.6.35-rc3' into for-linus

[linux-drm-fsl-dcu.git] / net / caif / cfsrvl.c

diff --git a/net/caif/cfsrvl.c b/net/caif/cfsrvl.c
index aff31f34528f8e7748d3a804b736e410787ac34f..6e5b7079a68424ff414a5f33d0500267b59d489e 100644 (file)
--- a/net/caif/cfsrvl.c
+++ b/net/caif/cfsrvl.c
@@ -123,6 +123,12 @@ static int cfservl_modemcmd(struct cflayer *layr, enum caif_modemcmd ctrl)
                        struct caif_payload_info *info;
                        u8 flow_off = SRVL_FLOW_OFF;
                        pkt = cfpkt_create(SRVL_CTRL_PKT_SIZE);
+                       if (!pkt) {
+                               pr_warning("CAIF: %s(): Out of memory\n",
+                                       __func__);
+                               return -ENOMEM;
+                       }
+
                        if (cfpkt_add_head(pkt, &flow_off, 1) < 0) {
                                pr_err("CAIF: %s(): Packet is erroneous!\n",
                                        __func__);