From 82d7133258ee73c3a3cc86c97f606312e5179c29 Mon Sep 17 00:00:00 2001 From: Alan Stern Date: Tue, 8 Nov 2005 15:51:55 -0500 Subject: [PATCH] --- yaml --- r: 13947 b: refs/heads/master c: 2ef8919830a262f10fb5e4a685e95f71a64bce6c h: refs/heads/master i: 13945: 4a748fb51b7cfd7285e4703ad24d8073f1b4b5ee 13943: 7930202d8e43550978b2b02039adf0a7569efaef v: v3 --- [refs] | 2 +- trunk/drivers/scsi/scsi_scan.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index c006fba1082b..3cd36d353530 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 34ea80ec6a02ad02e6b9c75c478c18e5880d6713 +refs/heads/master: 2ef8919830a262f10fb5e4a685e95f71a64bce6c diff --git a/trunk/drivers/scsi/scsi_scan.c b/trunk/drivers/scsi/scsi_scan.c index 7eb3a2d40dc5..27bcc8fb8cbc 100644 --- a/trunk/drivers/scsi/scsi_scan.c +++ b/trunk/drivers/scsi/scsi_scan.c @@ -1074,6 +1074,7 @@ static int scsi_report_lun_scan(struct scsi_target *starget, int bflags, struct scsi_sense_hdr sshdr; struct scsi_device *sdev; struct Scsi_Host *shost = dev_to_shost(&starget->dev); + int ret = 0; /* * Only support SCSI-3 and up devices if BLIST_NOREPORTLUN is not set. @@ -1169,8 +1170,8 @@ static int scsi_report_lun_scan(struct scsi_target *starget, int bflags, /* * The device probably does not support a REPORT LUN command */ - kfree(lun_data); - return 1; + ret = 1; + goto out_err; } /* @@ -1238,6 +1239,7 @@ static int scsi_report_lun_scan(struct scsi_target *starget, int bflags, } } + out_err: kfree(lun_data); out: scsi_device_put(sdev); @@ -1246,7 +1248,7 @@ static int scsi_report_lun_scan(struct scsi_target *starget, int bflags, * the sdev we used didn't appear in the report luns scan */ scsi_destroy_sdev(sdev); - return 0; + return ret; } struct scsi_device *__scsi_add_device(struct Scsi_Host *shost, uint channel,