Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 55269
b: refs/heads/master
c: 21d3649
h: refs/heads/master
i:
  55267: 93c7259
v: v3
  • Loading branch information
Tilman Schmidt authored and Linus Torvalds committed May 9, 2007
1 parent 6fd7ca5 commit 721142b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 11 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b590d2baf17f8890f648e76436abdb8674d564eb
refs/heads/master: 21d364954f5a2a97b4e378f34a13fbf296aa16ec
14 changes: 4 additions & 10 deletions trunk/drivers/isdn/gigaset/usb-gigaset.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 721142b

Please sign in to comment.