--- linux-2.6.13/drivers/scsi/cpqfcTSworker.c	2005-09-16 08:22:29.000000000 +0200
+++ linux-2.6.13-eike/drivers/scsi/cpqfcTSworker.c	2005-09-16 08:23:19.000000000 +0200
@@ -2669,6 +2669,10 @@ static void IssueReportLunsCommand(
       Cmnd,         // buffer for Report Lun data
       &x_ID );// fcController->fcExchanges index, -1 if failed
 
+		/* We've changed it, make sure it's the same as before.
+		 * If we don't change it back scsi_put_command() will fail */
+		Cmnd->device->id = cpqfcHBAdata->HostAdapter->this_id;
+
     if( !ulStatus ) // Exchange setup?
     {
       ulStatus = cpqfcTSStartExchange( cpqfcHBAdata, x_ID );