projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
usb: bc: add battery charger detect head file
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
scsi
/
hpsa.c
diff --git
a/drivers/scsi/hpsa.c
b/drivers/scsi/hpsa.c
index 0353d7f2172baaea5f63fa3e117b25b57e4a8c0d..62ed744bbe06c47487d5af052cfe9a9e46dbd32a 100644
(file)
--- a/
drivers/scsi/hpsa.c
+++ b/
drivers/scsi/hpsa.c
@@
-1206,8
+1206,8
@@
static void complete_scsi_command(struct CommandList *cp)
scsi_set_resid(cmd, ei->ResidualCnt);
if (ei->CommandStatus == 0) {
scsi_set_resid(cmd, ei->ResidualCnt);
if (ei->CommandStatus == 0) {
- cmd->scsi_done(cmd);
cmd_free(h, cp);
cmd_free(h, cp);
+ cmd->scsi_done(cmd);
return;
}
return;
}
@@
-1380,8
+1380,8
@@
static void complete_scsi_command(struct CommandList *cp)
dev_warn(&h->pdev->dev, "cp %p returned unknown status %x\n",
cp, ei->CommandStatus);
}
dev_warn(&h->pdev->dev, "cp %p returned unknown status %x\n",
cp, ei->CommandStatus);
}
- cmd->scsi_done(cmd);
cmd_free(h, cp);
cmd_free(h, cp);
+ cmd->scsi_done(cmd);
}
static void hpsa_pci_unmap(struct pci_dev *pdev,
}
static void hpsa_pci_unmap(struct pci_dev *pdev,
@@
-3118,7
+3118,7
@@
static int hpsa_big_passthru_ioctl(struct ctlr_info *h, void __user *argp)
}
if (ioc->Request.Type.Direction == XFER_WRITE) {
if (copy_from_user(buff[sg_used], data_ptr, sz)) {
}
if (ioc->Request.Type.Direction == XFER_WRITE) {
if (copy_from_user(buff[sg_used], data_ptr, sz)) {
- status = -E
NOMEM
;
+ status = -E
FAULT
;
goto cleanup1;
}
} else
goto cleanup1;
}
} else