2007-05-07 15:10:08

by Tilman Schmidt

[permalink] [raw]
Subject: [PATCH] usb_gigaset: don't kmalloc(0)

From: Tilman Schmidt <[email protected]>

Zero-sized allocations are pointless anyway, and the SLUB allocator
complains about them, so stop doing that.

Signed-off-by: Tilman Schmidt <[email protected]>
Signed-off-by: Hansjoerg Lipp <[email protected]>

---

--- a/drivers/isdn/gigaset/usb-gigaset.c 2007-05-07 10:08:41.000000000 +0200
+++ b/drivers/isdn/gigaset/usb-gigaset.c 2007-05-07 12:01:48.000000000 +0200
@@ -138,8 +138,6 @@ struct usb_cardstate {
char bchars[6]; /* for request 0x19 */
};

-struct usb_bc_state {};
-
static inline unsigned tiocm_to_gigaset(unsigned state)
{
return ((state & TIOCM_DTR) ? 1 : 0) | ((state & TIOCM_RTS) ? 2 : 0);
@@ -579,25 +577,21 @@ static int gigaset_brkchars(struct cards

static int gigaset_freebcshw(struct bc_state *bcs)
{
- if (!bcs->hw.usb)
- return 0;
- //FIXME
- kfree(bcs->hw.usb);
+ /* unused */
return 1;
}

/* Initialize the b-channel structure */
static int gigaset_initbcshw(struct bc_state *bcs)
{
- bcs->hw.usb = kmalloc(sizeof(struct usb_bc_state), GFP_KERNEL);
- if (!bcs->hw.usb)
- return 0;
-
+ /* unused */
+ bcs->hw.usb = NULL;
return 1;
}

static void gigaset_reinitbcshw(struct bc_state *bcs)
{
+ /* nothing to do for M10x */
}

static void gigaset_freecshw(struct cardstate *cs)

--
Tilman Schmidt E-Mail: [email protected]
Bonn, Germany
- Undetected errors are handled as if no error occurred. (IBM) -