Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 113474
b: refs/heads/master
c: 53e8631
h: refs/heads/master
v: v3
  • Loading branch information
Stephen Rothwell authored and Linus Torvalds committed Oct 13, 2008
1 parent b466d66 commit 700bb8d
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 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: 47afa7a5a8a8fb9e60cdb6a3bd612e07c37e9d90
refs/heads/master: 53e86317e967b9a1b1b78d6a076547144454bce1
2 changes: 1 addition & 1 deletion trunk/drivers/isdn/capi/capi.c
Original file line number Diff line number Diff line change
Expand Up @@ -1231,7 +1231,7 @@ static int capinc_tty_ioctl(struct tty_struct *tty, struct file * file,
int error = 0;
switch (cmd) {
default:
error = n_tty_ioctl (tty, file, cmd, arg);
error = n_tty_ioctl_helper(tty, file, cmd, arg);
break;
}
return error;
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/isdn/gigaset/ser-gigaset.c
Original file line number Diff line number Diff line change
Expand Up @@ -645,7 +645,7 @@ gigaset_tty_ioctl(struct tty_struct *tty, struct file *file,
case TCGETS:
case TCGETA:
/* pass through to underlying serial device */
rc = n_tty_ioctl(tty, file, cmd, arg);
rc = n_tty_ioctl_helper(tty, file, cmd, arg);
break;

case TCFLSH:
Expand All @@ -660,7 +660,7 @@ gigaset_tty_ioctl(struct tty_struct *tty, struct file *file,
break;
}
/* flush the serial port's buffer */
rc = n_tty_ioctl(tty, file, cmd, arg);
rc = n_tty_ioctl_helper(tty, file, cmd, arg);
break;

case FIONREAD:
Expand Down

0 comments on commit 700bb8d

Please sign in to comment.