Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 165721
b: refs/heads/master
c: cd60451
h: refs/heads/master
i:
  165719: a551328
v: v3
  • Loading branch information
Andrew Morton authored and Linus Torvalds committed Sep 24, 2009
1 parent b684616 commit f0815a9
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d68721eb339e9237c11c1fea5f73f86211d14918
refs/heads/master: cd6045138ed1bb5d8773e940d51c34318eef3ef2
5 changes: 5 additions & 0 deletions trunk/drivers/usb/serial/sierra.c
Original file line number Diff line number Diff line change
Expand Up @@ -912,6 +912,7 @@ static void sierra_release(struct usb_serial *serial)
}
}

#ifdef CONFIG_PM
static void stop_read_write_urbs(struct usb_serial *serial)
{
int i, j;
Expand Down Expand Up @@ -988,6 +989,10 @@ static int sierra_resume(struct usb_serial *serial)

return ec ? -EIO : 0;
}
#else
#define sierra_suspend NULL
#define sierra_resume NULL
#endif

static struct usb_serial_driver sierra_device = {
.driver = {
Expand Down

0 comments on commit f0815a9

Please sign in to comment.