Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
e4eeb143
Commit
e4eeb143
authored
Mar 21, 2003
by
Alan Cox
Committed by
Linus Torvalds
Mar 21, 2003
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[PATCH] fix all the other watchdogs Dave's changes broke the same
parent
3f7a8e97
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
29 additions
and
4 deletions
+29
-4
drivers/char/watchdog/ib700wdt.c
drivers/char/watchdog/ib700wdt.c
+2
-0
drivers/char/watchdog/indydog.c
drivers/char/watchdog/indydog.c
+3
-0
drivers/char/watchdog/machzwd.c
drivers/char/watchdog/machzwd.c
+3
-0
drivers/char/watchdog/mixcomwd.c
drivers/char/watchdog/mixcomwd.c
+3
-1
drivers/char/watchdog/pcwd.c
drivers/char/watchdog/pcwd.c
+1
-1
drivers/char/watchdog/sbc60xxwdt.c
drivers/char/watchdog/sbc60xxwdt.c
+3
-1
drivers/char/watchdog/sc520_wdt.c
drivers/char/watchdog/sc520_wdt.c
+2
-0
drivers/char/watchdog/shwdt.c
drivers/char/watchdog/shwdt.c
+4
-0
drivers/char/watchdog/softdog.c
drivers/char/watchdog/softdog.c
+3
-1
drivers/char/watchdog/wdt977.c
drivers/char/watchdog/wdt977.c
+2
-0
drivers/char/watchdog/wdt_pci.c
drivers/char/watchdog/wdt_pci.c
+3
-0
No files found.
drivers/char/watchdog/ib700wdt.c
View file @
e4eeb143
...
@@ -228,6 +228,8 @@ ibwdt_open(struct inode *inode, struct file *file)
...
@@ -228,6 +228,8 @@ ibwdt_open(struct inode *inode, struct file *file)
spin_unlock
(
&
ibwdt_lock
);
spin_unlock
(
&
ibwdt_lock
);
return
-
EBUSY
;
return
-
EBUSY
;
}
}
if
(
nowayout
)
MOD_INC_USE_COUNT
;
/* Activate */
/* Activate */
ibwdt_is_open
=
1
;
ibwdt_is_open
=
1
;
...
...
drivers/char/watchdog/indydog.c
View file @
e4eeb143
...
@@ -53,6 +53,9 @@ static int indydog_open(struct inode *inode, struct file *file)
...
@@ -53,6 +53,9 @@ static int indydog_open(struct inode *inode, struct file *file)
if
(
test_and_set_bit
(
0
,
&
indydog_alive
)
)
if
(
test_and_set_bit
(
0
,
&
indydog_alive
)
)
return
-
EBUSY
;
return
-
EBUSY
;
if
(
nowayout
)
MOD_INC_USE_COUNT
;
/*
/*
* Activate timer
* Activate timer
*/
*/
...
...
drivers/char/watchdog/machzwd.c
View file @
e4eeb143
...
@@ -390,6 +390,9 @@ static int zf_open(struct inode *inode, struct file *file)
...
@@ -390,6 +390,9 @@ static int zf_open(struct inode *inode, struct file *file)
return
-
EBUSY
;
return
-
EBUSY
;
}
}
if
(
nowayout
)
MOD_INC_USE_COUNT
;
zf_is_open
=
1
;
zf_is_open
=
1
;
spin_unlock
(
&
zf_lock
);
spin_unlock
(
&
zf_lock
);
...
...
drivers/char/watchdog/mixcomwd.c
View file @
e4eeb143
...
@@ -93,7 +93,9 @@ static int mixcomwd_open(struct inode *inode, struct file *file)
...
@@ -93,7 +93,9 @@ static int mixcomwd_open(struct inode *inode, struct file *file)
}
}
mixcomwd_ping
();
mixcomwd_ping
();
if
(
!
nowayout
)
{
if
(
nowayout
)
{
MOD_INC_USE_COUNT
;
}
else
{
if
(
mixcomwd_timer_alive
)
{
if
(
mixcomwd_timer_alive
)
{
del_timer
(
&
mixcomwd_timer
);
del_timer
(
&
mixcomwd_timer
);
mixcomwd_timer_alive
=
0
;
mixcomwd_timer_alive
=
0
;
...
...
drivers/char/watchdog/pcwd.c
View file @
e4eeb143
...
@@ -430,7 +430,7 @@ static int pcwd_open(struct inode *ino, struct file *filep)
...
@@ -430,7 +430,7 @@ static int pcwd_open(struct inode *ino, struct file *filep)
atomic_inc
(
&
open_allowed
);
atomic_inc
(
&
open_allowed
);
return
-
EBUSY
;
return
-
EBUSY
;
}
}
MOD_INC_USE_COUNT
;
/* Enable the port */
/* Enable the port */
if
(
revision
==
PCWD_REVISION_C
)
{
if
(
revision
==
PCWD_REVISION_C
)
{
spin_lock
(
&
io_lock
);
spin_lock
(
&
io_lock
);
...
...
drivers/char/watchdog/sbc60xxwdt.c
View file @
e4eeb143
...
@@ -206,7 +206,9 @@ static int fop_open(struct inode * inode, struct file * file)
...
@@ -206,7 +206,9 @@ static int fop_open(struct inode * inode, struct file * file)
/* Just in case we're already talking to someone... */
/* Just in case we're already talking to someone... */
if
(
wdt_is_open
)
if
(
wdt_is_open
)
return
-
EBUSY
;
return
-
EBUSY
;
if
(
nowayout
)
{
MOD_INC_USE_COUNT
;
}
/* Good, fire up the show */
/* Good, fire up the show */
wdt_is_open
=
1
;
wdt_is_open
=
1
;
wdt_startup
();
wdt_startup
();
...
...
drivers/char/watchdog/sc520_wdt.c
View file @
e4eeb143
...
@@ -229,6 +229,8 @@ static int fop_open(struct inode * inode, struct file * file)
...
@@ -229,6 +229,8 @@ static int fop_open(struct inode * inode, struct file * file)
return
-
EBUSY
;
return
-
EBUSY
;
/* Good, fire up the show */
/* Good, fire up the show */
wdt_startup
();
wdt_startup
();
if
(
nowayout
)
MOD_INC_USE_COUNT
;
return
0
;
return
0
;
default:
default:
...
...
drivers/char/watchdog/shwdt.c
View file @
e4eeb143
...
@@ -189,6 +189,10 @@ static int sh_wdt_open(struct inode *inode, struct file *file)
...
@@ -189,6 +189,10 @@ static int sh_wdt_open(struct inode *inode, struct file *file)
if
(
test_and_set_bit
(
0
,
&
sh_is_open
))
if
(
test_and_set_bit
(
0
,
&
sh_is_open
))
return
-
EBUSY
;
return
-
EBUSY
;
if
(
nowayout
)
{
MOD_INC_USE_COUNT
;
}
sh_wdt_start
();
sh_wdt_start
();
break
;
break
;
...
...
drivers/char/watchdog/softdog.c
View file @
e4eeb143
...
@@ -103,7 +103,9 @@ static int softdog_open(struct inode *inode, struct file *file)
...
@@ -103,7 +103,9 @@ static int softdog_open(struct inode *inode, struct file *file)
{
{
if
(
test_and_set_bit
(
0
,
&
timer_alive
))
if
(
test_and_set_bit
(
0
,
&
timer_alive
))
return
-
EBUSY
;
return
-
EBUSY
;
if
(
nowayout
)
{
MOD_INC_USE_COUNT
;
}
/*
/*
* Activate timer
* Activate timer
*/
*/
...
...
drivers/char/watchdog/wdt977.c
View file @
e4eeb143
...
@@ -99,6 +99,8 @@ static int wdt977_open(struct inode *inode, struct file *file)
...
@@ -99,6 +99,8 @@ static int wdt977_open(struct inode *inode, struct file *file)
if
(
nowayout
)
if
(
nowayout
)
{
{
MOD_INC_USE_COUNT
;
/* do not permit disabling the watchdog by writing 0 to reg. 0xF2 */
/* do not permit disabling the watchdog by writing 0 to reg. 0xF2 */
if
(
!
timeoutM
)
timeoutM
=
DEFAULT_TIMEOUT
;
if
(
!
timeoutM
)
timeoutM
=
DEFAULT_TIMEOUT
;
}
}
...
...
drivers/char/watchdog/wdt_pci.c
View file @
e4eeb143
...
@@ -365,6 +365,9 @@ static int wdtpci_open(struct inode *inode, struct file *file)
...
@@ -365,6 +365,9 @@ static int wdtpci_open(struct inode *inode, struct file *file)
if
(
down_trylock
(
&
open_sem
))
if
(
down_trylock
(
&
open_sem
))
return
-
EBUSY
;
return
-
EBUSY
;
if
(
nowayout
)
{
MOD_INC_USE_COUNT
;
}
/*
/*
* Activate
* Activate
*/
*/
...
...
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