Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=1da0c93b31bb8f374a22f4e20dab02fd79f6c7e6
Commit:     1da0c93b31bb8f374a22f4e20dab02fd79f6c7e6
Parent:     5f48047756339065df3e6fead381978abb0bc557
Author:     Kristian Høgsberg <[EMAIL PROTECTED]>
AuthorDate: Wed Mar 7 12:12:40 2007 -0500
Committer:  Stefan Richter <[EMAIL PROTECTED]>
CommitDate: Fri Mar 9 22:03:07 2007 +0100

    firewire: Only use INIT_DELAYED_WORK for first initialization.
    
    Use PREPARE_DELAYED_WORK to just change the function pointer.
    
    Signed-off-by: Kristian Høgsberg <[EMAIL PROTECTED]>
    Signed-off-by: Stefan Richter <[EMAIL PROTECTED]>
---
 drivers/firewire/fw-sbp2.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c
index 2259e22..994914f 100644
--- a/drivers/firewire/fw-sbp2.c
+++ b/drivers/firewire/fw-sbp2.c
@@ -1,5 +1,5 @@
 /*                                             -*- c-basic-offset: 8 -*-
- * fw-sbp2.c -- SBP2 driver (SCSI over IEEE1394)
+ * fw-spb2.c -- SBP2 driver (SCSI over IEEE1394)
  *
  * Copyright (C) 2005-2007  Kristian Hoegsberg <[EMAIL PROTECTED]>
  *
@@ -577,7 +577,7 @@ static void sbp2_login(struct work_struct *work)
        sbp2_set_busy_timeout(scsi_id);
 #endif
 
-       INIT_DELAYED_WORK(&sd->work, sbp2_reconnect);
+       PREPARE_DELAYED_WORK(&sd->work, sbp2_reconnect);
        sbp2_agent_reset(unit);
 
        retval = add_scsi_devices(unit);
@@ -587,7 +587,7 @@ static void sbp2_login(struct work_struct *work)
                                         NULL);
                /* Set this back to sbp2_login so we fall back and
                 * retry login on bus reset. */
-               INIT_DELAYED_WORK(&sd->work, sbp2_login);
+               PREPARE_DELAYED_WORK(&sd->work, sbp2_login);
        }
 }
 
@@ -714,7 +714,7 @@ static void sbp2_reconnect(struct work_struct *work)
                                 unit->device.bus_id);
                        /* Fall back and try to log in again. */
                        sd->retries = 0;
-                       INIT_DELAYED_WORK(&sd->work, sbp2_login);
+                       PREPARE_DELAYED_WORK(&sd->work, sbp2_login);
                }
                schedule_delayed_work(&sd->work, DIV_ROUND_UP(HZ, 5));
                return;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to