VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / drivers / ieee1394 / sbp2.c

diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c
index 17f17e2..47de79f 100644 (file)
--- a/drivers/ieee1394/sbp2.c
+++ b/drivers/ieee1394/sbp2.c
@@ -65,7 +65,7 @@
 #include <asm/scatterlist.h>
 
 #include "../scsi/scsi.h"
-#include "../scsi/hosts.h"
+#include <scsi/scsi_host.h>
 
 #include "csr1212.h"
 #include "ieee1394.h"
@@ -78,7 +78,7 @@
 #include "sbp2.h"
 
 static char version[] __devinitdata =
-       "$Rev: 1205 $ Ben Collins <bcollins@debian.org>";
+       "$Rev: 1219 $ Ben Collins <bcollins@debian.org>";
 
 /*
  * Module load parameter definitions
@@ -876,10 +876,10 @@ alloc_fail:
                        SBP2_DMA_FREE("login FIFO DMA");
                }
 
-               kfree(scsi_id);
-
                list_del(&scsi_id->scsi_list);
 
+               kfree(scsi_id);
+
                SBP2_ERR ("Could not allocate memory for scsi_id");
 
                return -ENOMEM;