From 721142bce36f60e6ce0d24edbac8cb35ce54e343 Mon Sep 17 00:00:00 2001 From: Tilman Schmidt Date: Tue, 8 May 2007 20:27:03 -0700 Subject: [PATCH] --- yaml --- r: 55269 b: refs/heads/master c: 21d364954f5a2a97b4e378f34a13fbf296aa16ec h: refs/heads/master i: 55267: 93c7259339593ba67def730b0fcec1d8a941c669 v: v3 --- [refs] | 2 +- trunk/drivers/isdn/gigaset/usb-gigaset.c | 14 ++++---------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 18c4c9d36515..7ecfcc25e8cf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b590d2baf17f8890f648e76436abdb8674d564eb +refs/heads/master: 21d364954f5a2a97b4e378f34a13fbf296aa16ec diff --git a/trunk/drivers/isdn/gigaset/usb-gigaset.c b/trunk/drivers/isdn/gigaset/usb-gigaset.c index c8e1c357cec8..a1263019df5e 100644 --- a/trunk/drivers/isdn/gigaset/usb-gigaset.c +++ b/trunk/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 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)