| Message ID | 1477926250-10292-1-git-send-email-weiyj.lk@gmail.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
On 31/10/16 15:04, Wei Yongjun wrote: > From: Wei Yongjun <weiyongjun1@huawei.com> > > Fix to return error code -ENOMEM from the error handling > case instead of 0, as done elsewhere in this function. > > Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> > --- > drivers/scsi/mvsas/mv_sas.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/scsi/mvsas/mv_sas.c b/drivers/scsi/mvsas/mv_sas.c > index 86eb199..c7cc803 100644 > --- a/drivers/scsi/mvsas/mv_sas.c > +++ b/drivers/scsi/mvsas/mv_sas.c > @@ -791,8 +791,10 @@ static int mvs_task_prep(struct sas_task *task, struct mvs_info *mvi, int is_tmf > slot->slot_tag = tag; > > slot->buf = pci_pool_alloc(mvi->dma_pool, GFP_ATOMIC, &slot->buf_dma); > - if (!slot->buf) > + if (!slot->buf) { > + rc = -ENOMEM; > goto err_out_tag; > + } > memset(slot->buf, 0, MVS_SLOT_BUF_SZ); > > tei.task = task; > Looks good to me. This will make the rc in dev_printk() and prep_out correct. Thanks, Luis -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Oct 31, 2016 at 03:04:10PM +0000, Wei Yongjun wrote: > From: Wei Yongjun <weiyongjun1@huawei.com> > > Fix to return error code -ENOMEM from the error handling > case instead of 0, as done elsewhere in this function. > > Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> Applied to libata/for-4.9-fixes. Thanks.
On Mon, Oct 31, 2016 at 10:29:26AM -0600, Tejun Heo wrote: > On Mon, Oct 31, 2016 at 03:04:10PM +0000, Wei Yongjun wrote: > > From: Wei Yongjun <weiyongjun1@huawei.com> > > > > Fix to return error code -ENOMEM from the error handling > > case instead of 0, as done elsewhere in this function. > > > > Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> > > Applied to libata/for-4.9-fixes. I messed up. This should have gone through scsi, not libata. Chatted with Martin and as the patch is a small obvious fix decided to leave it in libata tree. My apologies for the confusion. Thanks.
diff --git a/drivers/scsi/mvsas/mv_sas.c b/drivers/scsi/mvsas/mv_sas.c index 86eb199..c7cc803 100644 --- a/drivers/scsi/mvsas/mv_sas.c +++ b/drivers/scsi/mvsas/mv_sas.c @@ -791,8 +791,10 @@ static int mvs_task_prep(struct sas_task *task, struct mvs_info *mvi, int is_tmf slot->slot_tag = tag; slot->buf = pci_pool_alloc(mvi->dma_pool, GFP_ATOMIC, &slot->buf_dma); - if (!slot->buf) + if (!slot->buf) { + rc = -ENOMEM; goto err_out_tag; + } memset(slot->buf, 0, MVS_SLOT_BUF_SZ); tei.task = task;