diff for duplicates of <20150205080042.GC27855@mwanda> diff --git a/a/1.txt b/N1/1.txt index 477dfdf..069879b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -44,7 +44,7 @@ index 11288d4..c8a01ee 100644 * @dev: net device structure @@ -456,7 +476,7 @@ static int init_rx_ring(struct net_device *dev, u8 queue_no, /* RX ring is not allcoated */ - if (rx_ring = NULL) { + if (rx_ring == NULL) { netdev_err(dev, "No memory for RX queue\n"); - goto error; + return -ENOMEM; @@ -54,7 +54,7 @@ index 11288d4..c8a01ee 100644 @@ -468,23 +488,21 @@ static int init_rx_ring(struct net_device *dev, u8 queue_no, &rx_ring->dma_rx_phy, GFP_KERNEL); - if (rx_ring->dma_rx = NULL) + if (rx_ring->dma_rx == NULL) - goto error; + return -ENOMEM; diff --git a/a/content_digest b/N1/content_digest index 75b1ac0..2cc4483 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020150116071229.GH5520@mwanda\0" "From\0Dan Carpenter <dan.carpenter@oracle.com>\0" "Subject\0[patch] net: sxgbe: fix error handling in init_rx_ring()\0" - "Date\0Thu, 05 Feb 2015 08:00:42 +0000\0" + "Date\0Thu, 5 Feb 2015 11:00:42 +0300\0" "To\0Byungho An <bh74.an@samsung.com>" " kgene@kernel.org\0" "Cc\0Girish K S <ks.giri@samsung.com>" @@ -56,7 +56,7 @@ " * @dev: net device structure\n" "@@ -456,7 +476,7 @@ static int init_rx_ring(struct net_device *dev, u8 queue_no,\n" " \t/* RX ring is not allcoated */\n" - " \tif (rx_ring = NULL) {\n" + " \tif (rx_ring == NULL) {\n" " \t\tnetdev_err(dev, \"No memory for RX queue\\n\");\n" "-\t\tgoto error;\n" "+\t\treturn -ENOMEM;\n" @@ -66,7 +66,7 @@ "@@ -468,23 +488,21 @@ static int init_rx_ring(struct net_device *dev, u8 queue_no,\n" " \t\t\t\t\t &rx_ring->dma_rx_phy, GFP_KERNEL);\n" " \n" - " \tif (rx_ring->dma_rx = NULL)\n" + " \tif (rx_ring->dma_rx == NULL)\n" "-\t\tgoto error;\n" "+\t\treturn -ENOMEM;\n" " \n" @@ -130,4 +130,4 @@ " /**\n" * free_tx_ring - free the TX descriptor ring -c3443afdc2f39d26b6464db2bcee973061f2492e1892aa8e512e14c64887c24f +6e0a34549f479682aafdcbbb5a3eb9d3a9585b37f3bee2c8fddbb3851b671ac6
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.