Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 319224
b: refs/heads/master
c: 2437b0d
h: refs/heads/master
v: v3
  • Loading branch information
Sachin Kamat authored and Thierry Reding committed Jul 23, 2012
1 parent 1be0dd8 commit 6a93c6e
Show file tree
Hide file tree
Showing 2 changed files with 5 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: 6192fa87447ed3c6c4005be640a088fa8e5733f8
refs/heads/master: 2437b0d95c609365ce88039b96a1c020af71c6dc
6 changes: 4 additions & 2 deletions trunk/drivers/pwm/pwm-samsung.c
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
* the Free Software Foundation; either version 2 of the License.
*/

#define pr_fmt(fmt) "pwm-samsung: " fmt

#include <linux/export.h>
#include <linux/kernel.h>
#include <linux/platform_device.h>
Expand Down Expand Up @@ -340,13 +342,13 @@ static int __init pwm_init(void)
clk_scaler[1] = clk_get(NULL, "pwm-scaler1");

if (IS_ERR(clk_scaler[0]) || IS_ERR(clk_scaler[1])) {
printk(KERN_ERR "%s: failed to get scaler clocks\n", __func__);
pr_err("failed to get scaler clocks\n");
return -EINVAL;
}

ret = platform_driver_register(&s3c_pwm_driver);
if (ret)
printk(KERN_ERR "%s: failed to add pwm driver\n", __func__);
pr_err("failed to add pwm driver\n");

return ret;
}
Expand Down

0 comments on commit 6a93c6e

Please sign in to comment.