From d7ff15a431f6c93426070a8a19a59ce595fda6ee Mon Sep 17 00:00:00 2001 From: Chad Dupuis Date: Fri, 8 Feb 2013 01:57:46 -0500 Subject: [PATCH] --- yaml --- r: 360229 b: refs/heads/master c: 1bcc46cb74d3ba7471eac57af8931ca1a03e7b36 h: refs/heads/master i: 360227: b97ad2d1a2fc8290f4ced7736d59dfb5affea561 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/qla2xxx/qla_bsg.c | 8 ++++++++ trunk/drivers/scsi/qla2xxx/qla_dbg.c | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 892b46c89b2d..08ea8b4afebc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 37f489b580929c542dddc4bb6389d3aeb9bd39be +refs/heads/master: 1bcc46cb74d3ba7471eac57af8931ca1a03e7b36 diff --git a/trunk/drivers/scsi/qla2xxx/qla_bsg.c b/trunk/drivers/scsi/qla2xxx/qla_bsg.c index f7cb6a3fa7d4..5b49766e0ae7 100644 --- a/trunk/drivers/scsi/qla2xxx/qla_bsg.c +++ b/trunk/drivers/scsi/qla2xxx/qla_bsg.c @@ -746,6 +746,14 @@ qla2x00_process_loopback(struct fc_bsg_job *bsg_job) goto done_free_dma_rsp; } + if ((config[0] & INTERNAL_LOOPBACK_MASK) != 0) { + ql_dbg(ql_dbg_user, vha, 0x70c4, + "Loopback operation already in " + "progress.\n"); + rval = -EAGAIN; + goto done_free_dma_rsp; + } + ql_dbg(ql_dbg_user, vha, 0x70c0, "elreq.options=%04x\n", elreq.options); diff --git a/trunk/drivers/scsi/qla2xxx/qla_dbg.c b/trunk/drivers/scsi/qla2xxx/qla_dbg.c index af045ed0a230..c1d2310c615e 100644 --- a/trunk/drivers/scsi/qla2xxx/qla_dbg.c +++ b/trunk/drivers/scsi/qla2xxx/qla_dbg.c @@ -24,7 +24,7 @@ * | Async Events | 0x5071 | 0x502b-0x502f | * | | | 0x5047,0x5052 | * | Timer Routines | 0x6011 | | - * | User Space Interactions | 0x70c3 | 0x7018,0x702e, | + * | User Space Interactions | 0x70c4 | 0x7018,0x702e, | * | | | 0x7020,0x7024, | * | | | 0x7039,0x7045, | * | | | 0x7073-0x7075, |