Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 280803
b: refs/heads/master
c: 99823f4
h: refs/heads/master
i:
  280801: feef8e5
  280799: fbecc98
v: v3
  • Loading branch information
Havard Skinnemoen authored and Greg Kroah-Hartman committed Dec 10, 2011
1 parent 1e4a771 commit 9c5f9db
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7bf01185c5e9ec19f739f7208646dc2e2cf1904b
refs/heads/master: 99823f457d5994b3bd3775515578c8bfacc64b04
10 changes: 1 addition & 9 deletions trunk/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 9c5f9db

Please sign in to comment.