aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Bottomley <James.Bottomley@SteelEye.com>2005-12-26 09:58:49 -0600
committerLinus Torvalds <torvalds@g5.osdl.org>2005-12-26 10:17:43 -0800
commit04333393b930370db0cc29fdf0dbbd08ecd43337 (patch)
treef50d8ab5315919c34ef2c97d99f92e3920b4c4d4
parentf89f5948fc10bb973cd452d2e334da207828e228 (diff)
downloadlinux-linaro-stable-04333393b930370db0cc29fdf0dbbd08ecd43337.tar.gz
[PATCH] Fix Fibre Channel boot oops
The oops is characteristic of the underlying device being removed from visibility before the class device, and sure enough we do device_del() before transport_unregister() in the scsi_target_reap() routines. I've no idea why this is suddenly showing up, since the code has been in there since that function was first invented. However, I've confirmed this fixes Andrew Vasquez's boot oops. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/scsi/scsi_scan.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index e36c21e06d31..4e6709f448e1 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -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;