5 files changed, 48 insertions, 38 deletions

diff --git a/drivers/s390/net/ctcm_fsms.c b/drivers/s390/net/ctcm_fsms.c
index d4ade9e92fbb..fb92524d24ef 100644
--- a/drivers/s390/net/ctcm_fsms.c
+++ b/drivers/s390/net/ctcm_fsms.c
@@ -1523,7 +1523,7 @@ static void ctcmpc_chx_firstio(fsm_instance *fi, int event, void *arg)
                                 goto done;
         default:
                 break;
-        };
+        }
 
         fsm_newstate(fi, (CHANNEL_DIRECTION(ch->flags) == CTCM_READ)
                      ? CTC_STATE_RXINIT : CTC_STATE_TXINIT);
diff --git a/drivers/s390/net/ctcm_main.c b/drivers/s390/net/ctcm_main.c
index 5227e5734a9d..98ea9cc6f1aa 100644
--- a/drivers/s390/net/ctcm_main.c
+++ b/drivers/s390/net/ctcm_main.c
@@ -1454,7 +1454,7 @@ static int add_channel(struct ccw_device *cdev, enum ctcm_channel_types type,
                                 ch_fsm_len, GFP_KERNEL);
         }
         if (ch->fsm == NULL)
-                                goto free_return;
+                                goto nomem_return;
 
         fsm_newstate(ch->fsm, CTC_STATE_IDLE);
 
diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c
index a3adf4b1c60d..2ca0f1dd7a00 100644
--- a/drivers/s390/net/lcs.c
+++ b/drivers/s390/net/lcs.c
@@ -282,7 +282,7 @@ lcs_setup_write_ccws(struct lcs_card *card)
 
         LCS_DBF_TEXT(3, setup, "iwritccw");
         /* Setup write ccws. */
-        memset(card->write.ccws, 0, sizeof(struct ccw1) * LCS_NUM_BUFFS + 1);
+        memset(card->write.ccws, 0, sizeof(struct ccw1) * (LCS_NUM_BUFFS + 1));
         for (cnt = 0; cnt < LCS_NUM_BUFFS; cnt++) {
                 card->write.ccws[cnt].cmd_code = LCS_CCW_WRITE;
                 card->write.ccws[cnt].count = 0;
diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
index cf6da7fafe54..3e25d3150456 100644
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -489,7 +489,7 @@ static struct qeth_reply *qeth_alloc_reply(struct qeth_card *card)
                 atomic_set(&reply->refcnt, 1);
                 atomic_set(&reply->received, 0);
                 reply->card = card;
-        };
+        }
         return reply;
 }
 
@@ -1257,7 +1257,30 @@ static void qeth_clean_channel(struct qeth_channel *channel)
                 kfree(channel->iob[cnt].data);
 }
 
-static void qeth_get_channel_path_desc(struct qeth_card *card)
+static void qeth_set_single_write_queues(struct qeth_card *card)
+{
+        if ((atomic_read(&card->qdio.state) != QETH_QDIO_UNINITIALIZED) &&
+            (card->qdio.no_out_queues == 4))
+                qeth_free_qdio_buffers(card);
+
+        card->qdio.no_out_queues = 1;
+        if (card->qdio.default_out_queue != 0)
+                dev_info(&card->gdev->dev, "Priority Queueing not supported\n");
+
+        card->qdio.default_out_queue = 0;
+}
+
+static void qeth_set_multiple_write_queues(struct qeth_card *card)
+{
+        if ((atomic_read(&card->qdio.state) != QETH_QDIO_UNINITIALIZED) &&
+            (card->qdio.no_out_queues == 1)) {
+                qeth_free_qdio_buffers(card);
+                card->qdio.default_out_queue = 2;
+        }
+        card->qdio.no_out_queues = 4;
+}
+
+static void qeth_update_from_chp_desc(struct qeth_card *card)
 {
         struct ccw_device *ccwdev;
         struct channelPath_dsc {
@@ -1274,38 +1297,23 @@ static void qeth_get_channel_path_desc(struct qeth_card *card)
         QETH_DBF_TEXT(SETUP, 2, "chp_desc");
 
         ccwdev = card->data.ccwdev;
-        chp_dsc = (struct channelPath_dsc *)ccw_device_get_chp_desc(ccwdev, 0);
-        if (chp_dsc != NULL) {
-                if (card->info.type != QETH_CARD_TYPE_IQD) {
-                        /* CHPP field bit 6 == 1 -> single queue */
-                        if ((chp_dsc->chpp & 0x02) == 0x02) {
-                                if ((atomic_read(&card->qdio.state) !=
-                                        QETH_QDIO_UNINITIALIZED) &&
-                                    (card->qdio.no_out_queues == 4))
-                                        /* change from 4 to 1 outbound queues */
-                                        qeth_free_qdio_buffers(card);
-                                card->qdio.no_out_queues = 1;
-                                if (card->qdio.default_out_queue != 0)
-                                        dev_info(&card->gdev->dev,
-                                        "Priority Queueing not supported\n");
-                                card->qdio.default_out_queue = 0;
-                        } else {
-                                if ((atomic_read(&card->qdio.state) !=
-                                        QETH_QDIO_UNINITIALIZED) &&
-                                    (card->qdio.no_out_queues == 1)) {
-                                        /* change from 1 to 4 outbound queues */
-                                        qeth_free_qdio_buffers(card);
-                                        card->qdio.default_out_queue = 2;
-                                }
-                                card->qdio.no_out_queues = 4;
-                        }
-                }
-                card->info.func_level = 0x4100 + chp_dsc->desc;
-                kfree(chp_dsc);
-        }
+        chp_dsc = ccw_device_get_chp_desc(ccwdev, 0);
+        if (!chp_dsc)
+                goto out;
+
+        card->info.func_level = 0x4100 + chp_dsc->desc;
+        if (card->info.type == QETH_CARD_TYPE_IQD)
+                goto out;
+
+        /* CHPP field bit 6 == 1 -> single queue */
+        if ((chp_dsc->chpp & 0x02) == 0x02)
+                qeth_set_single_write_queues(card);
+        else
+                qeth_set_multiple_write_queues(card);
+out:
+        kfree(chp_dsc);
         QETH_DBF_TEXT_(SETUP, 2, "nr:%x", card->qdio.no_out_queues);
         QETH_DBF_TEXT_(SETUP, 2, "lvl:%02x", card->info.func_level);
-        return;
 }
 
 static void qeth_init_qdio_info(struct qeth_card *card)
@@ -1473,7 +1481,7 @@ static int qeth_determine_card_type(struct qeth_card *card)
                         card->qdio.no_in_queues = 1;
                         card->info.is_multicast_different =
                                 known_devices[i][QETH_MULTICAST_IND];
-                        qeth_get_channel_path_desc(card);
+                        qeth_update_from_chp_desc(card);
                         return 0;
                 }
                 i++;
@@ -2029,7 +2037,7 @@ int qeth_send_control_data(struct qeth_card *card, int len,
                         if (time_after(jiffies, timeout))
                                 goto time_err;
                         cpu_relax();
-                };
+                }
         }
 
         if (reply->rc == -EIO)
@@ -4735,7 +4743,7 @@ int qeth_core_hardsetup_card(struct qeth_card *card)
 
         QETH_DBF_TEXT(SETUP, 2, "hrdsetup");
         atomic_set(&card->force_alloc_skb, 0);
-        qeth_get_channel_path_desc(card);
+        qeth_update_from_chp_desc(card);
 retry:
         if (retries)
                 QETH_DBF_MESSAGE(2, "%s Retrying to do IDX activates.\n",
diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
index c5f03fa70fba..4cd310cb5bdf 100644
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c
@@ -794,6 +794,7 @@ int qeth_l3_add_vipa(struct qeth_card *card, enum qeth_prot_versions proto,
                 rc = -EEXIST;
         spin_unlock_irqrestore(&card->ip_lock, flags);
         if (rc) {
+                kfree(ipaddr);
                 return rc;
         }
         if (!qeth_l3_add_ip(card, ipaddr))
@@ -858,6 +859,7 @@ int qeth_l3_add_rxip(struct qeth_card *card, enum qeth_prot_versions proto,
                 rc = -EEXIST;
         spin_unlock_irqrestore(&card->ip_lock, flags);
         if (rc) {
+                kfree(ipaddr);
                 return rc;
         }
         if (!qeth_l3_add_ip(card, ipaddr))