Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...

[linux-2.6-omap-h63xx.git] / drivers / misc / ibmasm / r_heartbeat.c

diff --git a/drivers/misc/ibmasm/r_heartbeat.c b/drivers/misc/ibmasm/r_heartbeat.c
index 93d9c1b2ad6f0de596adf483b8a57f19f9a2af6e..bec9e2c44bef2655d2ed98eb6b6f70d8a143383c 100644 (file)
--- a/drivers/misc/ibmasm/r_heartbeat.c
+++ b/drivers/misc/ibmasm/r_heartbeat.c
@@ -16,7 +16,7 @@
  *
  * Copyright (C) IBM Corporation, 2004
  *
- * Author: Max Asböck <amax@us.ibm.com> 
+ * Author: Max Asböck <amax@us.ibm.com>
  *
  */
 
@@ -36,10 +36,10 @@ static struct {
        unsigned char                   command[3];
 } rhb_dot_cmd = {
        .header = {
-               .type =         sp_read,
+               .type =         sp_read,
                .command_size = 3,
                .data_size =    0,
-               .status =       0
+               .status =       0
        },
        .command = { 4, 3, 6 }
 };
@@ -63,7 +63,7 @@ int ibmasm_start_reverse_heartbeat(struct service_processor *sp, struct reverse_
        int times_failed = 0;
        int result = 1;
 
-       cmd = ibmasm_new_command(sizeof rhb_dot_cmd);
+       cmd = ibmasm_new_command(sp, sizeof rhb_dot_cmd);
        if (!cmd)
                return -ENOMEM;
 
@@ -76,9 +76,9 @@ int ibmasm_start_reverse_heartbeat(struct service_processor *sp, struct reverse_
                if (cmd->status != IBMASM_CMD_COMPLETE)
                        times_failed++;
 
-               wait_event_interruptible_timeout(rhb->wait, 
+               wait_event_interruptible_timeout(rhb->wait,
                        rhb->stopped,
-                       REVERSE_HEARTBEAT_TIMEOUT * HZ);        
+                       REVERSE_HEARTBEAT_TIMEOUT * HZ);
 
                if (signal_pending(current) || rhb->stopped) {
                        result = -EINTR;