← Back to branch summary

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

« back to all changes in this revision

Viewing changes to drivers/usb/serial/io_ti.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/usb/serial/io_ti.c
433
433
 
434
434
        /* We can only send a maximum of 1 aligned byte page at a time */
435
435
 
436
 
        /* calulate the number of bytes left in the first page */
 
436
        /* calculate the number of bytes left in the first page */
437
437
        write_length = EPROM_PAGE_SIZE -
438
438
                                (start_address & (EPROM_PAGE_SIZE - 1));
439
439
 
2444
2444
        change_port_settings(tty, edge_port, old_termios);
2445
2445
}
2446
2446
 
2447
 
static int edge_tiocmset(struct tty_struct *tty, struct file *file,
 
2447
static int edge_tiocmset(struct tty_struct *tty,
2448
2448
                                        unsigned int set, unsigned int clear)
2449
2449
{
2450
2450
        struct usb_serial_port *port = tty->driver_data;
2477
2477
        return 0;
2478
2478
}
2479
2479
 
2480
 
static int edge_tiocmget(struct tty_struct *tty, struct file *file)
 
2480
static int edge_tiocmget(struct tty_struct *tty)
2481
2481
{
2482
2482
        struct usb_serial_port *port = tty->driver_data;
2483
2483
        struct edgeport_port *edge_port = usb_get_serial_port_data(port);
2552
2552
        return 0;
2553
2553
}
2554
2554
 
2555
 
static int edge_ioctl(struct tty_struct *tty, struct file *file,
 
2555
static int edge_ioctl(struct tty_struct *tty,
2556
2556
                                        unsigned int cmd, unsigned long arg)
2557
2557
{
2558
2558
        struct usb_serial_port *port = tty->driver_data;