diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-17 19:27:39 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-17 19:27:39 +0100 |
| commit | e40bffaeaed9c5a26c3e5c961c3dee72c1b46558 (patch) | |
| tree | 619aa9f481fbddb267dcd6f1ef454c846bdfc983 /drivers/scsi/be2iscsi/be_main.c | |
| parent | staging: bcm: Typedefs.h Fix "foo * bar" warning. (diff) | |
| parent | Linux 3.14-rc7 (diff) | |
| download | linux-e40bffaeaed9c5a26c3e5c961c3dee72c1b46558.tar.xz linux-e40bffaeaed9c5a26c3e5c961c3dee72c1b46558.zip | |
Merge 3.14-rc7 into staging-next
This resolves a merge issue with drivers/staging/cxt1e1/linux.c that was
fixed in a report from Stephen Rothwell
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/scsi/be2iscsi/be_main.c')
| -rw-r--r-- | drivers/scsi/be2iscsi/be_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c index 1f375051483a..5642a9b250c2 100644 --- a/drivers/scsi/be2iscsi/be_main.c +++ b/drivers/scsi/be2iscsi/be_main.c @@ -325,7 +325,7 @@ static int beiscsi_eh_device_reset(struct scsi_cmnd *sc) if (!abrt_task->sc || abrt_task->state == ISCSI_TASK_FREE) continue; - if (abrt_task->sc->device->lun != abrt_task->sc->device->lun) + if (sc->device->lun != abrt_task->sc->device->lun) continue; /* Invalidate WRB Posted for this Task */ |