Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21d36495 authored by Tilman Schmidt's avatar Tilman Schmidt Committed by Linus Torvalds
Browse files

usb_gigaset: don't kmalloc(0) 



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

Signed-off-by: default avatarTilman Schmidt <tilman@imap.cc>
Signed-off-by: default avatarHansjoerg Lipp <hjlipp@web.de>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b590d2ba

drivers/isdn/gigaset/usb-gigaset.c

+4 −10
Original line number Diff line number Diff line
@@ -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 cardstate *cs, const unsigned char buf[6]) 


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)