On Mon, Apr 28, 2008 at 10:47:42AM -0700, Daniel Walker wrote: > Signed-off-by: Daniel Walker <dwalker@xxxxxxxxxx> I did this one too ... my version had a nice little twist. > @@ -2813,7 +2814,7 @@ qla2x00_request_firmware(scsi_qla_host_t > blob = &qla_fw_blobs[FW_ISP25XX]; > } > > - down(&qla_fw_lock); > + mutex_lock(&qla_fw_lock); > if (blob->fw) > goto out; > This one we can do as: - down(&qla_fw_lock); + if (mutex_lock_killable(&qla_fw_lock)) + return NULL; + Otherwise, I think our patches are bit-for-bit identical. -- Intel are signing my paycheques ... these opinions are still mine "Bill, look, we understand that you're interested in selling us this operating system, but compare it to ours. We can't possibly take such a retrograde step." -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html