diff options
Diffstat (limited to 'drivers/isdn/gigaset')
| -rw-r--r-- | drivers/isdn/gigaset/asyncdata.c | 4 | ||||
| -rw-r--r-- | drivers/isdn/gigaset/ev-layer.c | 4 | ||||
| -rw-r--r-- | drivers/isdn/gigaset/interface.c | 13 | ||||
| -rw-r--r-- | drivers/isdn/gigaset/isocdata.c | 2 |
4 files changed, 17 insertions, 6 deletions
diff --git a/drivers/isdn/gigaset/asyncdata.c b/drivers/isdn/gigaset/asyncdata.c index bc208557f783..c0cbee06bc21 100644 --- a/drivers/isdn/gigaset/asyncdata.c +++ b/drivers/isdn/gigaset/asyncdata.c @@ -65,7 +65,7 @@ static unsigned cmd_loop(unsigned numbytes, struct inbuf_t *inbuf) cs->respdata[0] = 0; break; } - /* --v-- fall through --v-- */ + /* fall through */ case '\r': /* end of message line, pass to response handler */ if (cbytes >= MAX_RESP_SIZE) { @@ -100,7 +100,7 @@ static unsigned cmd_loop(unsigned numbytes, struct inbuf_t *inbuf) goto exit; } /* quoted or not in DLE mode: treat as regular data */ - /* --v-- fall through --v-- */ + /* fall through */ default: /* append to line buffer if possible */ if (cbytes < MAX_RESP_SIZE) diff --git a/drivers/isdn/gigaset/ev-layer.c b/drivers/isdn/gigaset/ev-layer.c index 1cfcea62aed9..182826e9d07c 100644 --- a/drivers/isdn/gigaset/ev-layer.c +++ b/drivers/isdn/gigaset/ev-layer.c @@ -1036,7 +1036,7 @@ static void handle_icall(struct cardstate *cs, struct bc_state *bcs, break; default: dev_err(cs->dev, "internal error: disposition=%d\n", retval); - /* --v-- fall through --v-- */ + /* fall through */ case ICALL_IGNORE: case ICALL_REJECT: /* hang up actively @@ -1319,7 +1319,7 @@ static void do_action(int action, struct cardstate *cs, cs->commands_pending = 1; break; } - /* bad cid: fall through */ + /* fall through - bad cid */ case ACT_FAILCID: cs->cur_at_seq = SEQ_NONE; channel = cs->curchannel; diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c index 600c79b030cd..d9a578ac32cd 100644 --- a/drivers/isdn/gigaset/interface.c +++ b/drivers/isdn/gigaset/interface.c @@ -206,7 +206,7 @@ static int if_ioctl(struct tty_struct *tty, ? -EFAULT : 0; if (retval >= 0) { gigaset_dbg_buffer(DEBUG_IF, "GIGASET_BRKCHARS", - 6, (const unsigned char *) arg); + 6, buf); retval = cs->ops->brkchars(cs, buf); } break; @@ -233,6 +233,14 @@ static int if_ioctl(struct tty_struct *tty, return retval; } +#ifdef CONFIG_COMPAT +static long if_compat_ioctl(struct tty_struct *tty, + unsigned int cmd, unsigned long arg) +{ + return if_ioctl(tty, cmd, (unsigned long)compat_ptr(arg)); +} +#endif + static int if_tiocmget(struct tty_struct *tty) { struct cardstate *cs = tty->driver_data; @@ -472,6 +480,9 @@ static const struct tty_operations if_ops = { .open = if_open, .close = if_close, .ioctl = if_ioctl, +#ifdef CONFIG_COMPAT + .compat_ioctl = if_compat_ioctl, +#endif .write = if_write, .write_room = if_write_room, .chars_in_buffer = if_chars_in_buffer, diff --git a/drivers/isdn/gigaset/isocdata.c b/drivers/isdn/gigaset/isocdata.c index 97e00118ccfe..f9264ba0fe77 100644 --- a/drivers/isdn/gigaset/isocdata.c +++ b/drivers/isdn/gigaset/isocdata.c @@ -906,7 +906,7 @@ static void cmd_loop(unsigned char *src, int numbytes, struct inbuf_t *inbuf) cs->respdata[0] = 0; break; } - /* --v-- fall through --v-- */ + /* fall through */ case '\r': /* end of message line, pass to response handler */ if (cbytes >= MAX_RESP_SIZE) { |