56 lines
1.9 KiB
Diff
56 lines
1.9 KiB
Diff
From 6771ec5b24042ea92c2a872d28b41e39c4445c68 Mon Sep 17 00:00:00 2001
|
|
Message-Id: <6771ec5b24042ea92c2a872d28b41e39c4445c68.1527544850.git.Jim.Somerville@windriver.com>
|
|
In-Reply-To: <b6ceef1c915827b50ce3f76da4dc47f3eb768b44.1527544850.git.Jim.Somerville@windriver.com>
|
|
References: <b6ceef1c915827b50ce3f76da4dc47f3eb768b44.1527544850.git.Jim.Somerville@windriver.com>
|
|
From: Hannes Reinecke <hare@suse.de>
|
|
Date: Mon, 6 Jul 2015 13:07:58 +0200
|
|
Subject: [PATCH 24/26] aic94xx: Skip reading user settings if flash is not
|
|
found
|
|
|
|
If no user settings are found it's pointless trying to
|
|
read them from flash. So skip that step.
|
|
This also fixes a compilation warning about uninitialized variables in
|
|
aic94xx.
|
|
|
|
Signed-off-by: Hannes Reinecke <hare@suse.de>
|
|
Reviewed-by: Christoph Hellwig <hch@lst.de>
|
|
Signed-off-by: James Bottomley <JBottomley@Odin.com>
|
|
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
|
|
---
|
|
drivers/scsi/aic94xx/aic94xx_sds.c | 5 +++--
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/drivers/scsi/aic94xx/aic94xx_sds.c b/drivers/scsi/aic94xx/aic94xx_sds.c
|
|
index edb43fd..c831e30 100644
|
|
--- a/drivers/scsi/aic94xx/aic94xx_sds.c
|
|
+++ b/drivers/scsi/aic94xx/aic94xx_sds.c
|
|
@@ -983,7 +983,7 @@ static int asd_process_ctrl_a_user(struct asd_ha_struct *asd_ha,
|
|
{
|
|
int err, i;
|
|
u32 offs, size;
|
|
- struct asd_ll_el *el;
|
|
+ struct asd_ll_el *el = NULL;
|
|
struct asd_ctrla_phy_settings *ps;
|
|
struct asd_ctrla_phy_settings dflt_ps;
|
|
|
|
@@ -1004,6 +1004,7 @@ static int asd_process_ctrl_a_user(struct asd_ha_struct *asd_ha,
|
|
|
|
size = sizeof(struct asd_ctrla_phy_settings);
|
|
ps = &dflt_ps;
|
|
+ goto out_process;
|
|
}
|
|
|
|
if (size == 0)
|
|
@@ -1028,7 +1029,7 @@ static int asd_process_ctrl_a_user(struct asd_ha_struct *asd_ha,
|
|
ASD_DPRINTK("couldn't find ctrla phy settings struct\n");
|
|
goto out2;
|
|
}
|
|
-
|
|
+out_process:
|
|
err = asd_process_ctrla_phy_settings(asd_ha, ps);
|
|
if (err) {
|
|
ASD_DPRINTK("couldn't process ctrla phy settings\n");
|
|
--
|
|
1.8.3.1
|
|
|