Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 303320
b: refs/heads/master
c: a53157c
h: refs/heads/master
v: v3
  • Loading branch information
Shawn Guo committed May 12, 2012
1 parent 6a59832 commit 3d24f49
Show file tree
Hide file tree
Showing 2 changed files with 7 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: b2bccee1793ebcf47272fc6556e741a9fba896c7
refs/heads/master: a53157c21c699c392921e243fa96abc27722f910
6 changes: 6 additions & 0 deletions trunk/drivers/net/can/flexcan.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
#include <linux/module.h>
#include <linux/of.h>
#include <linux/platform_device.h>
#include <linux/pinctrl/consumer.h>

#define DRV_NAME "flexcan"

Expand Down Expand Up @@ -927,11 +928,16 @@ static int __devinit flexcan_probe(struct platform_device *pdev)
struct flexcan_priv *priv;
struct resource *mem;
struct clk *clk = NULL;
struct pinctrl *pinctrl;
void __iomem *base;
resource_size_t mem_size;
int err, irq;
u32 clock_freq = 0;

pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
if (IS_ERR(pinctrl))
return PTR_ERR(pinctrl);

if (pdev->dev.of_node) {
const u32 *clock_freq_p;

Expand Down

0 comments on commit 3d24f49

Please sign in to comment.