← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to drivers/s390/char/tty3270.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/s390/char/tty3270.c
328
328
 
329
329
        tp = (struct tty3270 *) rq->view;
330
330
        if (rq->rc != 0) {
331
 
                /* Write wasn't successfull. Refresh all. */
 
331
                /* Write wasn't successful. Refresh all. */
332
332
                tp->update_flags = TTY_UPDATE_ALL;
333
333
                tty3270_set_timer(tp, 1);
334
334
        }
1718
1718
{
1719
1719
}
1720
1720
 
1721
 
static int
1722
 
tty3270_ioctl(struct tty_struct *tty, struct file *file,
1723
 
              unsigned int cmd, unsigned long arg)
 
1721
static int tty3270_ioctl(struct tty_struct *tty, unsigned int cmd,
 
1722
                         unsigned long arg)
1724
1723
{
1725
1724
        struct tty3270 *tp;
1726
1725
 
1729
1728
                return -ENODEV;
1730
1729
        if (tty->flags & (1 << TTY_IO_ERROR))
1731
1730
                return -EIO;
1732
 
        return kbd_ioctl(tp->kbd, file, cmd, arg);
 
1731
        return kbd_ioctl(tp->kbd, cmd, arg);
1733
1732
}
1734
1733
 
1735
1734
#ifdef CONFIG_COMPAT
1736
 
static long
1737
 
tty3270_compat_ioctl(struct tty_struct *tty, struct file *file,
1738
 
              unsigned int cmd, unsigned long arg)
 
1735
static long tty3270_compat_ioctl(struct tty_struct *tty,
 
1736
                                 unsigned int cmd, unsigned long arg)
1739
1737
{
1740
1738
        struct tty3270 *tp;
1741
1739
 
1744
1742
                return -ENODEV;
1745
1743
        if (tty->flags & (1 << TTY_IO_ERROR))
1746
1744
                return -EIO;
1747
 
        return kbd_ioctl(tp->kbd, file, cmd, (unsigned long)compat_ptr(arg));
 
1745
        return kbd_ioctl(tp->kbd, cmd, (unsigned long)compat_ptr(arg));
1748
1746
}
1749
1747
#endif
1750
1748