2014-10-14 17:01:04

by Fabian Frédérick

Subject: [PATCH V2 1/2 net-next] caif_usb: remove redundant memory message

Let MM subsystem display out of memory messages.

Signed-off-by: Fabian Frederick <[email protected]>
---
V2: add second patch with memset fix

net/caif/caif_usb.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/net/caif/caif_usb.c b/net/caif/caif_usb.c
index ba02db0..0e487b0 100644
--- a/net/caif/caif_usb.c
+++ b/net/caif/caif_usb.c
@@ -87,10 +87,9 @@ static struct cflayer *cfusbl_create(int phyid, u8 ethaddr[ETH_ALEN],
{
struct cfusbl *this = kmalloc(sizeof(struct cfusbl), GFP_ATOMIC);

- if (!this) {
- pr_warn("Out of memory\n");
+ if (!this)
return NULL;
- }
+
caif_assert(offsetof(struct cfusbl, layer) == 0);

memset(this, 0, sizeof(struct cflayer));
--
1.9.3

2014-10-14 20:06:00

by David Miller

Subject: Re: [PATCH V2 1/2 net-next] caif_usb: remove redundant memory message

From: Fabian Frederick <[email protected]>
Date: Tue, 14 Oct 2014 19:00:55 +0200

> Let MM subsystem display out of memory messages.
>
> Signed-off-by: Fabian Frederick <[email protected]>
> ---
> V2: add second patch with memset fix

Applied.