From: Julia Lawall <Julia.Lawall@lip6.fr> To: linux-kernel@vger.kernel.org Cc: kernel-janitors@vger.kernel.org Subject: [PATCH 15/25] fix error return code Date: Sun, 29 Dec 2013 23:47:32 +0100 [thread overview] Message-ID: <1388357260-4843-18-git-send-email-Julia.Lawall@lip6.fr> (raw) In-Reply-To: <1388357260-4843-1-git-send-email-Julia.Lawall@lip6.fr> From: Julia Lawall <Julia.Lawall@lip6.fr> Set the return variable to an error code as done elsewhere in the function. A simplified version of the semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> ( if@p1 (\(ret < 0\|ret != 0\)) { ... return ret; } | ret@p1 = 0 ) ... when != ret = e1 when != &ret *if(...) { ... when != ret = e2 when forall return ret; } // </smpl> Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr> --- Not tested. drivers/block/umem.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/block/umem.c b/drivers/block/umem.c index 4cf81b5..371e819 100644 --- a/drivers/block/umem.c +++ b/drivers/block/umem.c @@ -881,6 +881,7 @@ static int mm_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) if (card->mm_pages[0].desc == NULL || card->mm_pages[1].desc == NULL) { dev_printk(KERN_ERR, &card->dev->dev, "alloc failed\n"); + ret = -ENOMEM; goto failed_alloc; } reset_page(&card->mm_pages[0]); @@ -891,8 +892,10 @@ static int mm_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) card->biotail = &card->bio; card->queue = blk_alloc_queue(GFP_KERNEL); - if (!card->queue) + if (!card->queue) { + ret = -ENOMEM; goto failed_alloc; + } blk_queue_make_request(card->queue, mm_make_request); card->queue->queue_lock = &card->lock;
WARNING: multiple messages have this Message-ID (diff)
From: Julia Lawall <Julia.Lawall@lip6.fr> To: linux-kernel@vger.kernel.org Cc: kernel-janitors@vger.kernel.org Subject: [PATCH 15/25] fix error return code Date: Sun, 29 Dec 2013 21:53:09 +0000 [thread overview] Message-ID: <1388357260-4843-18-git-send-email-Julia.Lawall@lip6.fr> (raw) In-Reply-To: <1388357260-4843-1-git-send-email-Julia.Lawall@lip6.fr> From: Julia Lawall <Julia.Lawall@lip6.fr> Set the return variable to an error code as done elsewhere in the function. A simplified version of the semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> ( if@p1 (\(ret < 0\|ret != 0\)) { ... return ret; } | ret@p1 = 0 ) ... when != ret = e1 when != &ret *if(...) { ... when != ret = e2 when forall return ret; } // </smpl> Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr> --- Not tested. drivers/block/umem.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/block/umem.c b/drivers/block/umem.c index 4cf81b5..371e819 100644 --- a/drivers/block/umem.c +++ b/drivers/block/umem.c @@ -881,6 +881,7 @@ static int mm_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) if (card->mm_pages[0].desc = NULL || card->mm_pages[1].desc = NULL) { dev_printk(KERN_ERR, &card->dev->dev, "alloc failed\n"); + ret = -ENOMEM; goto failed_alloc; } reset_page(&card->mm_pages[0]); @@ -891,8 +892,10 @@ static int mm_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) card->biotail = &card->bio; card->queue = blk_alloc_queue(GFP_KERNEL); - if (!card->queue) + if (!card->queue) { + ret = -ENOMEM; goto failed_alloc; + } blk_queue_make_request(card->queue, mm_make_request); card->queue->queue_lock = &card->lock;
next prev parent reply other threads:[~2013-12-29 21:53 UTC|newest] Thread overview: 88+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-12-29 21:58 [PATCH 0/25] fix error return code Julia Lawall 2013-12-29 22:47 ` Julia Lawall 2013-12-29 22:47 ` Julia Lawall 2013-12-29 22:47 ` Julia Lawall 2013-12-29 22:47 ` Julia Lawall 2013-12-29 22:47 ` Julia Lawall 2013-12-29 21:52 ` [PATCH 23/25] thermal: exynos: " Julia Lawall 2013-12-29 22:47 ` Julia Lawall 2013-12-29 22:47 ` Julia Lawall 2013-12-30 1:31 ` Jingoo Han 2013-12-30 1:31 ` Jingoo Han 2013-12-30 1:31 ` Jingoo Han 2014-01-02 1:55 ` Zhang Rui 2014-01-02 1:55 ` Zhang Rui 2014-01-02 1:55 ` Zhang Rui 2013-12-29 21:53 ` [PATCH 21/25] fujitsu-laptop: " Julia Lawall 2013-12-29 22:47 ` Julia Lawall 2013-12-31 13:05 ` Jonathan Woithe 2013-12-31 13:17 ` Jonathan Woithe 2013-12-29 21:53 ` [PATCH 20/25] " Julia Lawall 2013-12-29 22:47 ` Julia Lawall 2013-12-29 21:53 ` Julia Lawall [this message] 2013-12-29 22:47 ` [PATCH 15/25] " Julia Lawall 2013-12-29 21:54 ` [PATCH 13/25] hamradio: 6pack: " Julia Lawall 2013-12-29 22:47 ` Julia Lawall 2014-01-02 8:31 ` David Miller 2014-01-02 8:31 ` David Miller 2013-12-29 21:54 ` [PATCH 24/25] " Julia Lawall 2013-12-29 22:47 ` Julia Lawall 2013-12-29 21:54 ` [PATCH 22/25] RDMA/nes: " Julia Lawall 2013-12-29 22:47 ` Julia Lawall 2013-12-29 21:54 ` [PATCH 14/25] RDMA/amso1100: " Julia Lawall 2013-12-29 22:47 ` Julia Lawall 2013-12-29 21:54 ` [PATCH 9/25] " Julia Lawall 2013-12-29 22:47 ` Julia Lawall 2013-12-29 21:55 ` [PATCH 19/25] " Julia Lawall 2013-12-29 22:47 ` Julia Lawall 2013-12-29 22:47 ` Julia Lawall 2013-12-29 21:58 ` Geert Uytterhoeven 2013-12-29 21:58 ` Geert Uytterhoeven 2013-12-29 21:58 ` Geert Uytterhoeven 2013-12-29 21:55 ` [PATCH 11/25] pcmcia: " Julia Lawall 2013-12-29 22:47 ` Julia Lawall 2013-12-29 21:55 ` [PATCH 12/25] HID: sony: " Julia Lawall 2013-12-29 22:47 ` Julia Lawall 2014-01-02 12:51 ` Jiri Kosina 2014-01-02 12:51 ` Jiri Kosina 2013-12-29 21:56 ` [PATCH 10/25] usb: gadget: " Julia Lawall 2013-12-29 22:47 ` Julia Lawall 2013-12-29 21:56 ` [PATCH 18/25] mtd: nand: " Julia Lawall 2013-12-29 22:47 ` Julia Lawall 2013-12-29 22:47 ` Julia Lawall 2013-12-29 21:56 ` [PATCH 16/25] block: " Julia Lawall 2013-12-29 22:47 ` Julia Lawall 2013-12-29 21:57 ` [PATCH 17/25] " Julia Lawall 2013-12-29 22:47 ` Julia Lawall 2013-12-29 21:57 ` [PATCH 6/25] " Julia Lawall 2013-12-29 22:47 ` Julia Lawall 2014-01-03 9:08 ` Jiri Kosina 2014-01-03 9:08 ` Jiri Kosina 2013-12-29 21:57 ` [PATCH 8/25] drivers/dma: " Julia Lawall 2013-12-29 22:47 ` Julia Lawall 2014-01-20 9:28 ` Vinod Koul 2014-01-20 9:40 ` Vinod Koul 2013-12-29 21:59 ` [PATCH 7/25] net: " Julia Lawall 2013-12-29 22:47 ` Julia Lawall 2014-01-02 8:31 ` David Miller 2014-01-02 8:31 ` David Miller 2013-12-29 21:59 ` [PATCH 5/25] IB/mlx4: " Julia Lawall 2013-12-29 22:47 ` Julia Lawall [not found] ` <1388357260-4843-6-git-send-email-Julia.Lawall-L2FTfq7BK8M@public.gmane.org> 2013-12-31 7:52 ` Jack Morgenstein 2013-12-31 7:52 ` Jack Morgenstein 2013-12-31 7:52 ` Jack Morgenstein 2013-12-29 21:59 ` [PATCH 3/25] " Julia Lawall 2013-12-29 22:47 ` Julia Lawall 2013-12-29 21:59 ` [PATCH 4/25] UBI: " Julia Lawall 2013-12-29 22:47 ` Julia Lawall 2013-12-29 22:47 ` Julia Lawall 2013-12-31 11:30 ` Richard Weinberger 2013-12-31 11:30 ` Richard Weinberger 2013-12-31 11:30 ` Richard Weinberger 2014-01-02 15:16 ` Artem Bityutskiy 2014-01-02 15:16 ` Artem Bityutskiy 2014-01-02 15:16 ` Artem Bityutskiy 2013-12-29 22:00 ` [PATCH 2/25] rsxx: " Julia Lawall 2013-12-29 22:47 ` Julia Lawall 2013-12-29 22:00 ` [PATCH 1/25] " Julia Lawall 2013-12-29 22:47 ` Julia Lawall
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1388357260-4843-18-git-send-email-Julia.Lawall@lip6.fr \ --to=julia.lawall@lip6.fr \ --cc=kernel-janitors@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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.