The patch titled
ieee1394: sbp2: fix deregistration of status fifo address space
has been removed from the -mm tree. Its filename is
ieee1394-sbp2-fix-deregistration-of-status-fifo-address-space.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: ieee1394: sbp2: fix deregistration of status fifo address space
From: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>
The proper designator of an invalid CSR address is ~(u64)0, not (u64)0.
Use the correct value in initialization and deregistration. Also,
scsi_id->sbp2_lun does not need to be initialized twice. (scsi_id was
kzalloc'd.)
Signed-off-by: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>
Cc: Jody McIntyre <scjody@xxxxxxxxxxxxxx>
Cc: Ben Collins <bcollins@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/ieee1394/sbp2.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff -puN drivers/ieee1394/sbp2.c~ieee1394-sbp2-fix-deregistration-of-status-fifo-address-space drivers/ieee1394/sbp2.c
--- devel/drivers/ieee1394/sbp2.c~ieee1394-sbp2-fix-deregistration-of-status-fifo-address-space 2006-06-03 17:17:19.000000000 -0700
+++ devel-akpm/drivers/ieee1394/sbp2.c 2006-06-03 17:17:19.000000000 -0700
@@ -794,12 +794,12 @@ static struct scsi_id_instance_data *sbp
scsi_id->ud = ud;
scsi_id->speed_code = IEEE1394_SPEED_100;
scsi_id->max_payload_size = sbp2_speedto_max_payload[IEEE1394_SPEED_100];
+ scsi_id->status_fifo_addr = ~0ULL;
atomic_set(&scsi_id->sbp2_login_complete, 0);
INIT_LIST_HEAD(&scsi_id->sbp2_command_orb_inuse);
INIT_LIST_HEAD(&scsi_id->sbp2_command_orb_completed);
INIT_LIST_HEAD(&scsi_id->scsi_list);
spin_lock_init(&scsi_id->sbp2_command_orb_lock);
- scsi_id->sbp2_lun = 0;
ud->device.driver_data = scsi_id;
@@ -1090,7 +1090,7 @@ static void sbp2_remove_device(struct sc
SBP2_DMA_FREE("single query logins data");
}
- if (scsi_id->status_fifo_addr)
+ if (scsi_id->status_fifo_addr != ~0ULL)
hpsb_unregister_addrspace(&sbp2_highlevel, hi->host,
scsi_id->status_fifo_addr);
_
Patches currently in -mm which might be from stefanr@xxxxxxxxxxxxxxxxx are
git-ieee1394.patch
lock-validator-annotate-ieee1394-skb-head-locking.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
