The patch titled usb_gigaset: don't kmalloc(0) has been added to the -mm tree. Its filename is usb_gigaset-dont-kmalloc0.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: usb_gigaset: don't kmalloc(0) From: Tilman Schmidt <tilman@xxxxxxx> Zero-sized allocations are pointless anyway, and the SLUB allocator complains about them, so stop doing that. Signed-off-by: Tilman Schmidt <tilman@xxxxxxx> Signed-off-by: Hansjoerg Lipp <hjlipp@xxxxxx> Cc: Greg KH <greg@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/isdn/gigaset/usb-gigaset.c | 14 ++++---------- 1 files changed, 4 insertions(+), 10 deletions(-) diff -puN drivers/isdn/gigaset/usb-gigaset.c~usb_gigaset-dont-kmalloc0 drivers/isdn/gigaset/usb-gigaset.c --- a/drivers/isdn/gigaset/usb-gigaset.c~usb_gigaset-dont-kmalloc0 +++ a/drivers/isdn/gigaset/usb-gigaset.c @@ -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) _ Patches currently in -mm which might be from tilman@xxxxxxx are origin.patch codingstyle-start-flamewar-about-use-of-braces.patch usb_gigaset-dont-kmalloc0.patch remove-obsolete-label-from-isdn4linux-v3.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html