From 9c5f9dbe9ba1f53e2cd790ef5f765f1c5f0f7107 Mon Sep 17 00:00:00 2001 From: Havard Skinnemoen Date: Fri, 9 Dec 2011 16:51:54 -0800 Subject: [PATCH] --- yaml --- r: 280803 b: refs/heads/master c: 99823f457d5994b3bd3775515578c8bfacc64b04 h: refs/heads/master i: 280801: feef8e557bfa5abcac96a3665c384468bcbfae0e 280799: fbecc98576ddff37d40fcae96f32ce4d87da4bad v: v3 --- [refs] | 2 +- trunk/drivers/usb/class/cdc-acm.c | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index d118cd88f273..0f40a810bfc5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7bf01185c5e9ec19f739f7208646dc2e2cf1904b +refs/heads/master: 99823f457d5994b3bd3775515578c8bfacc64b04 diff --git a/trunk/drivers/usb/class/cdc-acm.c b/trunk/drivers/usb/class/cdc-acm.c index 3027ada1b812..d9d9340abe60 100644 --- a/trunk/drivers/usb/class/cdc-acm.c +++ b/trunk/drivers/usb/class/cdc-acm.c @@ -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 */ @@ -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); @@ -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) @@ -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;