Skip to content

Commit

Permalink
usb: cdc-acm: Kill ACM_READY() macro completely
Browse files Browse the repository at this point in the history
The ACM_READY() macro doesn't seem to do anything useful, and it may
prevent tty_wait_until_sent() from working properly when called from
close.

Previously, acm_tty_chars_in_buffer() returned 0 whenever
acm->port.count was 0. This means close() could return before all the
data has actually been written.

Signed-off-by: Havard Skinnemoen <hskinnemoen@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Havard Skinnemoen authored and Greg Kroah-Hartman committed Dec 10, 2011
1 parent 7bf0118 commit 99823f4
Showing 1 changed file with 1 addition and 9 deletions.
10 changes: 1 addition & 9 deletions drivers/usb/class/cdc-acm.c
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,6 @@ static struct acm *acm_table[ACM_TTY_MINORS];

static DEFINE_MUTEX(acm_table_lock);

#define ACM_READY(acm) (acm && acm->dev && acm->port.count)

/*
* acm_table accessors
*/
Expand Down Expand Up @@ -319,9 +317,6 @@ static void acm_ctrl_irq(struct urb *urb)
goto exit;
}

if (!ACM_READY(acm))
goto exit;

usb_mark_last_busy(acm->dev);

data = (unsigned char *)(dr + 1);
Expand Down Expand Up @@ -481,8 +476,7 @@ static void acm_write_bulk(struct urb *urb)
spin_lock_irqsave(&acm->write_lock, flags);
acm_write_done(acm, wb);
spin_unlock_irqrestore(&acm->write_lock, flags);
if (ACM_READY(acm))
schedule_work(&acm->work);
schedule_work(&acm->work);
}

static void acm_softint(struct work_struct *work)
Expand All @@ -492,8 +486,6 @@ static void acm_softint(struct work_struct *work)

dev_vdbg(&acm->data->dev, "%s\n", __func__);

if (!ACM_READY(acm))
return;
tty = tty_port_tty_get(&acm->port);
if (!tty)
return;
Expand Down

0 comments on commit 99823f4

Please sign in to comment.