Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dfc33383 authored by James Hogan's avatar James Hogan Committed by Wim Van Sebroeck
Browse files

[WATCHDOG] doc: Fix use of WDIOC_SETOPTIONS ioctl. 



In the watchdog-test program and watchdog-api.txt, pass the values to
the WDIOC_SETOPTIONS ioctl as a pointer to an integer containing the
values intead of directly in the third ioctl argument. The actual
watchdog drivers in drivers/watchdog don't read the options directly
from the argument but use get_user and copy_from_user.

Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent cf9cf9ae

Documentation/watchdog/src/watchdog-test.c

+6 −2
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ static void keep_alive(void) 
 */

int main(int argc, char *argv[])

{

    int flags;



    fd = open("/dev/watchdog", O_WRONLY);



    if (fd == -1) {
@@ -41,12 +43,14 @@ int main(int argc, char *argv[]) 


    if (argc > 1) {

	if (!strncasecmp(argv[1], "-d", 2)) {

	    ioctl(fd, WDIOC_SETOPTIONS, WDIOS_DISABLECARD);

	    flags = WDIOS_DISABLECARD;

	    ioctl(fd, WDIOC_SETOPTIONS, &flags);

	    fprintf(stderr, "Watchdog card disabled.\n");

	    fflush(stderr);

	    exit(0);

	} else if (!strncasecmp(argv[1], "-e", 2)) {

	    ioctl(fd, WDIOC_SETOPTIONS, WDIOS_ENABLECARD);

	    flags = WDIOS_ENABLECARD;

	    ioctl(fd, WDIOC_SETOPTIONS, &flags);

	    fprintf(stderr, "Watchdog card enabled.\n");

	    fflush(stderr);

	    exit(0);

Documentation/watchdog/watchdog-api.txt

+2 −3
Original line number Diff line number Diff line
@@ -222,11 +222,10 @@ returned value is the temperature in degrees fahrenheit. 
    ioctl(fd, WDIOC_GETTEMP, &temperature);



Finally the SETOPTIONS ioctl can be used to control some aspects of

the cards operation; right now the pcwd driver is the only one

supporting this ioctl.

the cards operation.



    int options = 0;

    ioctl(fd, WDIOC_SETOPTIONS, options);

    ioctl(fd, WDIOC_SETOPTIONS, &options);



The following options are available: