Merge tag 'blackfin-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/realm...

[karo-tx-linux.git] / drivers / s390 / char / vmwatchdog.c

diff --git a/drivers/s390/char/vmwatchdog.c b/drivers/s390/char/vmwatchdog.c
index e9b72311e2549a370f1d213c9a8277e7c233186f..d5eac985976b42b5b5617f5f14c762b505a8ece0 100644 (file)
--- a/drivers/s390/char/vmwatchdog.c
+++ b/drivers/s390/char/vmwatchdog.c
@@ -112,7 +112,8 @@ static int vmwdt_keepalive(void)
 
 static int vmwdt_disable(void)
 {
-       int ret = __diag288(wdt_cancel, 0, "", 0);
+       char cmd[] = {'\0'};
+       int ret = __diag288(wdt_cancel, 0, cmd, 0);
        WARN_ON(ret != 0);
        clear_bit(VMWDT_RUNNING, &vmwdt_is_open);
        return ret;
@@ -124,7 +125,7 @@ static int __init vmwdt_probe(void)
         * so we try initializing it with a NOP command ("BEGIN")
         * that won't cause any harm even if the following disable
         * fails for some reason */
-       static char __initdata ebc_begin[] = {
+       char ebc_begin[] = {
                194, 197, 199, 201, 213
        };
        if (__diag288(wdt_init, 15, ebc_begin, sizeof(ebc_begin)) != 0)