Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[pandora-kernel.git] / drivers / scsi / scsi_scan.c

diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index e36c21e..05ebb9c 100644 (file)
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -74,7 +74,7 @@
 #define SCSI_SCAN_TARGET_PRESENT       1
 #define SCSI_SCAN_LUN_PRESENT          2
 
-static char *scsi_null_device_strs = "nullnullnullnull";
+static const char *scsi_null_device_strs = "nullnullnullnull";
 
 #define MAX_SCSI_LUNS  512
 
@@ -418,8 +418,9 @@ static void scsi_target_reap_work(void *data) {
        if (--starget->reap_ref == 0 && list_empty(&starget->devices)) {
                list_del_init(&starget->siblings);
                spin_unlock_irqrestore(shost->host_lock, flags);
+               transport_remove_device(&starget->dev);
                device_del(&starget->dev);
-               transport_unregister_device(&starget->dev);
+               transport_destroy_device(&starget->dev);
                put_device(&starget->dev);
                return;