* [PATCH 1/2] drivers/s390/char/monreader.c: fix error return code
@ 2012-09-17 8:12 Peter Senna Tschudin
2012-09-17 8:12 ` [PATCH 2/2] drivers/s390/net/ctcm_main.c: " Peter Senna Tschudin
2012-09-20 14:40 ` [PATCH 1/2] drivers/s390/char/monreader.c: " Gerald Schaefer
0 siblings, 2 replies; 3+ messages in thread
From: Peter Senna Tschudin @ 2012-09-17 8:12 UTC (permalink / raw)
To: schwidefsky
Cc: heiko.carstens, linux390, peter.senna, linux-s390, linux-kernel,
kernel-janitors
From: Peter Senna Tschudin <peter.senna@gmail.com>
Convert a nonnegative error return code to a negative one, as returned
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: Peter Senna Tschudin <peter.senna@gmail.com>
---
drivers/s390/char/monreader.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/s390/char/monreader.c b/drivers/s390/char/monreader.c
index 5b8b859..f4ff515 100644
--- a/drivers/s390/char/monreader.c
+++ b/drivers/s390/char/monreader.c
@@ -571,8 +571,11 @@ static int __init mon_init(void)
if (rc)
goto out_iucv;
monreader_device = kzalloc(sizeof(struct device), GFP_KERNEL);
- if (!monreader_device)
+ if (!monreader_device) {
+ rc = -ENOMEM;
goto out_driver;
+ }
+
dev_set_name(monreader_device, "monreader-dev");
monreader_device->bus = &iucv_bus;
monreader_device->parent = iucv_root;
--
1.7.11.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH 2/2] drivers/s390/net/ctcm_main.c: fix error return code
2012-09-17 8:12 [PATCH 1/2] drivers/s390/char/monreader.c: fix error return code Peter Senna Tschudin
@ 2012-09-17 8:12 ` Peter Senna Tschudin
2012-09-20 14:40 ` [PATCH 1/2] drivers/s390/char/monreader.c: " Gerald Schaefer
1 sibling, 0 replies; 3+ messages in thread
From: Peter Senna Tschudin @ 2012-09-17 8:12 UTC (permalink / raw)
To: ursula.braun
Cc: blaschka, linux390, schwidefsky, heiko.carstens, linux-s390,
linux-kernel, kernel-janitors, Peter Senna Tschudin
From: Peter Senna Tschudin <peter.senna@gmail.com>
Convert a nonnegative error return code to a negative one, as returned
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: Peter Senna Tschudin <peter.senna@gmail.com>
---
drivers/s390/net/ctcm_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/s390/net/ctcm_main.c b/drivers/s390/net/ctcm_main.c
index 5227e57..98ea9cc 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);
--
1.7.11.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH 1/2] drivers/s390/char/monreader.c: fix error return code
2012-09-17 8:12 [PATCH 1/2] drivers/s390/char/monreader.c: fix error return code Peter Senna Tschudin
2012-09-17 8:12 ` [PATCH 2/2] drivers/s390/net/ctcm_main.c: " Peter Senna Tschudin
@ 2012-09-20 14:40 ` Gerald Schaefer
1 sibling, 0 replies; 3+ messages in thread
From: Gerald Schaefer @ 2012-09-20 14:40 UTC (permalink / raw)
To: Peter Senna Tschudin
Cc: schwidefsky, heiko.carstens, linux390, linux-s390, linux-kernel,
kernel-janitors
On Mon, 17 Sep 2012 10:12:00 +0200
Peter Senna Tschudin <peter.senna@gmail.com> wrote:
> From: Peter Senna Tschudin <peter.senna@gmail.com>
>
> Convert a nonnegative error return code to a negative one, as returned
> 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: Peter Senna Tschudin <peter.senna@gmail.com>
> ---
> drivers/s390/char/monreader.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/s390/char/monreader.c b/drivers/s390/char/monreader.c
> index 5b8b859..f4ff515 100644
> --- a/drivers/s390/char/monreader.c
> +++ b/drivers/s390/char/monreader.c
> @@ -571,8 +571,11 @@ static int __init mon_init(void)
> if (rc)
> goto out_iucv;
> monreader_device = kzalloc(sizeof(struct device), GFP_KERNEL);
> - if (!monreader_device)
> + if (!monreader_device) {
> + rc = -ENOMEM;
> goto out_driver;
> + }
> +
> dev_set_name(monreader_device, "monreader-dev");
> monreader_device->bus = &iucv_bus;
> monreader_device->parent = iucv_root;
Applied, thanks!
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-09-20 14:40 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-17 8:12 [PATCH 1/2] drivers/s390/char/monreader.c: fix error return code Peter Senna Tschudin
2012-09-17 8:12 ` [PATCH 2/2] drivers/s390/net/ctcm_main.c: " Peter Senna Tschudin
2012-09-20 14:40 ` [PATCH 1/2] drivers/s390/char/monreader.c: " Gerald Schaefer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).