Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 178943
b: refs/heads/master
c: 0a88422
h: refs/heads/master
i:
  178941: 4fa53d8
  178939: 5ba6d13
  178935: e27185d
  178927: ec8c0f9
  178911: 7c0ccbf
  178879: f3f9c9a
  178815: 11c0afa
  178687: 59a534c
v: v3
  • Loading branch information
Randy Dunlap authored and Linus Torvalds committed Jan 11, 2010
1 parent e0024f5 commit 48c595c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 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: 1306d603fcf1f6682f8575d1ff23631a24184b21
refs/heads/master: 0a88422312f5bf7b9e3450e27d8ddc385af38789
9 changes: 5 additions & 4 deletions trunk/drivers/base/power/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -446,8 +446,8 @@ EXPORT_SYMBOL_GPL(dpm_resume_noirq);

/**
* legacy_resume - Execute a legacy (bus or class) resume callback for device.
* dev: Device to resume.
* cb: Resume callback to execute.
* @dev: Device to resume.
* @cb: Resume callback to execute.
*/
static int legacy_resume(struct device *dev, int (*cb)(struct device *dev))
{
Expand Down Expand Up @@ -711,8 +711,9 @@ EXPORT_SYMBOL_GPL(dpm_suspend_noirq);

/**
* legacy_suspend - Execute a legacy (bus or class) suspend callback for device.
* dev: Device to suspend.
* cb: Suspend callback to execute.
* @dev: Device to suspend.
* @state: PM transition of the system being carried out.
* @cb: Suspend callback to execute.
*/
static int legacy_suspend(struct device *dev, pm_message_t state,
int (*cb)(struct device *dev, pm_message_t state))
Expand Down

0 comments on commit 48c595c

Please sign in to comment.