Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 202516
b: refs/heads/master
c: 1a14703
h: refs/heads/master
v: v3
  • Loading branch information
Jesse Barnes authored and Matthew Garrett committed Aug 3, 2010
1 parent 6a5c379 commit 664d83d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 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: 5aa06930fbcfcb6b03fcb18b753122b10ac47a87
refs/heads/master: 1a14703d6b20010401ca273ac1f07bff7992aa2c
4 changes: 2 additions & 2 deletions trunk/drivers/platform/x86/intel_ips.c
Original file line number Diff line number Diff line change
Expand Up @@ -607,7 +607,7 @@ static bool mcp_exceeded(struct ips_driver *ips)
spin_unlock_irqrestore(&ips->turbo_status_lock, flags);

if (ret)
dev_warn(&ips->dev->dev,
dev_info(&ips->dev->dev,
"MCP power or thermal limit exceeded\n");

return ret;
Expand Down Expand Up @@ -635,7 +635,7 @@ static bool cpu_exceeded(struct ips_driver *ips, int cpu)
spin_unlock_irqrestore(&ips->turbo_status_lock, flags);

if (ret)
dev_warn(&ips->dev->dev,
dev_info(&ips->dev->dev,
"CPU power or thermal limit exceeded\n");

return ret;
Expand Down

0 comments on commit 664d83d

Please sign in to comment.