From: Richard Knutsson [mailto:[EMAIL PROTECTED]
Okay by me. Thanks Richard.
Signed-off-by: Stuart MacDonald <[EMAIL PROTECTED]>
..Stu
> Signed-off-by: Richard Knutsson <[EMAIL PROTECTED]>
> ---
> Compile-tested with "allyes", "allmod" & "allno" on i386
>
>
> diff --git a/drivers/usb/serial/whiteheat.c
> b/drivers/usb/serial/whiteheat.c
> index bf16e9e..27c5f8f 100644
> --- a/drivers/usb/serial/whiteheat.c
> +++ b/drivers/usb/serial/whiteheat.c
> @@ -1109,7 +1109,7 @@ static int firm_send_command (struct
> usb_serial_port *port, __u8 command, __u8 *
> command_port = port->serial->port[COMMAND_PORT];
> command_info = usb_get_serial_port_data(command_port);
> spin_lock_irqsave(&command_info->lock, flags);
> - command_info->command_finished = FALSE;
> + command_info->command_finished = false;
>
> transfer_buffer = (__u8
> *)command_port->write_urb->transfer_buffer;
> transfer_buffer[0] = command;
> @@ -1124,12 +1124,12 @@ static int firm_send_command (struct
> usb_serial_port *port, __u8 command, __u8 *
> spin_unlock_irqrestore(&command_info->lock, flags);
>
> /* wait for the command to complete */
> - wait_event_interruptible_timeout(command_info->wait_command,
> - (command_info->command_finished != FALSE),
> COMMAND_TIMEOUT);
> + wait_event_interruptible_timeout(command_info->wait_command,
> + (bool)command_info->command_finished, COMMAND_TIMEOUT);
>
> spin_lock_irqsave(&command_info->lock, flags);
>
> - if (command_info->command_finished == FALSE) {
> + if (command_info->command_finished == false) {
> dbg("%s - command timed out.", __FUNCTION__);
> retval = -ETIMEDOUT;
> goto exit;
> diff --git a/drivers/usb/serial/whiteheat.h
> b/drivers/usb/serial/whiteheat.h
> index d714eff..f160797 100644
> --- a/drivers/usb/serial/whiteheat.h
> +++ b/drivers/usb/serial/whiteheat.h
> @@ -20,10 +20,6 @@
> #define __LINUX_USB_SERIAL_WHITEHEAT_H
>
>
> -#define FALSE 0
> -#define TRUE 1
> -
> -
> /* WhiteHEAT commands */
> #define WHITEHEAT_OPEN 1 /* open
> the port */
> #define WHITEHEAT_CLOSE 2 /*
> close the port */
>
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
linux-usb-devel@lists.sourceforge.net
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
