Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci
Commits
509163ca
Commit
509163ca
authored
Sep 08, 2009
by
Kevin Hilman
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'davinci-next-drivers'
Conflicts: drivers/video/Makefile drivers/watchdog/davinci_wdt.c
parents
3513f2e1
7db3f4ee
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
8 deletions
+6
-8
drivers/watchdog/davinci_wdt.c
drivers/watchdog/davinci_wdt.c
+6
-8
No files found.
drivers/watchdog/davinci_wdt.c
View file @
509163ca
...
@@ -90,7 +90,6 @@ static void wdt_enable(void)
...
@@ -90,7 +90,6 @@ static void wdt_enable(void)
u32
timer_margin
;
u32
timer_margin
;
u32
wdt_freq
;
u32
wdt_freq
;
BUG_ON
(
!
wdt_clk
);
wdt_freq
=
clk_get_rate
(
wdt_clk
);
wdt_freq
=
clk_get_rate
(
wdt_clk
);
spin_lock
(
&
io_lock
);
spin_lock
(
&
io_lock
);
...
@@ -206,8 +205,9 @@ static int __devinit davinci_wdt_probe(struct platform_device *pdev)
...
@@ -206,8 +205,9 @@ static int __devinit davinci_wdt_probe(struct platform_device *pdev)
struct
device
*
dev
=
&
pdev
->
dev
;
struct
device
*
dev
=
&
pdev
->
dev
;
wdt_clk
=
clk_get
(
dev
,
NULL
);
wdt_clk
=
clk_get
(
dev
,
NULL
);
if
(
WARN_ON
(
!
wdt_clk
))
if
(
WARN_ON
(
IS_ERR
(
wdt_clk
)))
return
-
ENODEV
;
return
PTR_ERR
(
wdt_clk
);
clk_enable
(
wdt_clk
);
clk_enable
(
wdt_clk
);
if
(
heartbeat
<
1
||
heartbeat
>
MAX_HEARTBEAT
)
if
(
heartbeat
<
1
||
heartbeat
>
MAX_HEARTBEAT
)
...
@@ -257,10 +257,8 @@ static int __devexit davinci_wdt_remove(struct platform_device *pdev)
...
@@ -257,10 +257,8 @@ static int __devexit davinci_wdt_remove(struct platform_device *pdev)
wdt_mem
=
NULL
;
wdt_mem
=
NULL
;
}
}
if
(
wdt_clk
)
{
clk_disable
(
wdt_clk
);
clk_disable
(
wdt_clk
);
clk_put
(
wdt_clk
);
clk_put
(
wdt_clk
);
}
return
0
;
return
0
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment