← Back to branch summary

~ubuntu-branches/ubuntu/karmic/linux-mvl-dove/karmic-proposed

« back to all changes in this revision

Viewing changes to drivers/usb/serial/whiteheat.c

  • Committer: Bazaar Package Importer
  • Author(s): Stefan Bader
  • Date: 2010-03-10 22:24:12 UTC
  • mto: (15.1.2 karmic-security)
  • mto: This revision was merged to the branch mainline in revision 18.
  • Revision ID: james.westby@ubuntu.com-20100310222412-k86m3r53jw0je7x1
Tags: upstream-2.6.31
Import upstream version 2.6.31

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/usb/serial/whiteheat.c
259
259
                                                __u8 *data, __u8 datasize);
260
260
static int firm_open(struct usb_serial_port *port);
261
261
static int firm_close(struct usb_serial_port *port);
262
 
static void firm_setup_port(struct tty_struct *tty);
 
262
static int firm_setup_port(struct tty_struct *tty);
263
263
static int firm_set_rts(struct usb_serial_port *port, __u8 onoff);
264
264
static int firm_set_dtr(struct usb_serial_port *port, __u8 onoff);
265
265
static int firm_set_break(struct usb_serial_port *port, __u8 onoff);
1211
1211
}
1212
1212
 
1213
1213
 
1214
 
static void firm_setup_port(struct tty_struct *tty)
 
1214
static int firm_setup_port(struct tty_struct *tty)
1215
1215
{
1216
1216
        struct usb_serial_port *port = tty->driver_data;
1217
1217
        struct whiteheat_port_settings port_settings;
1286
1286
        port_settings.lloop = 0;
1287
1287
 
1288
1288
        /* now send the message to the device */
1289
 
        firm_send_command(port, WHITEHEAT_SETUP_PORT,
 
1289
        return firm_send_command(port, WHITEHEAT_SETUP_PORT,
1290
1290
                        (__u8 *)&port_settings, sizeof(port_settings));
1291
1291
}
1292
1292