bab9bb6b69
Create new directories: ceph config config-files filesystem kernel kernel/kernel-modules ldap logging strorage-drivers tools utilities virt Retire directories: connectivity core devtools support extended Delete two packages: tgt irqbalance Relocated packages: base/ dhcp initscripts libevent lighttpd linuxptp memcached net-snmp novnc ntp openssh pam procps sanlock shadow sudo systemd util-linux vim watchdog ceph/ python-cephclient config/ facter puppet-4.8.2 puppet-modules filesystem/ e2fsprogs nfs-utils nfscheck kernel/ kernel-std kernel-rt kernel/kernel-modules/ mlnx-ofa_kernel ldap/ nss-pam-ldapd openldap logging/ syslog-ng logrotate networking/ lldpd iproute mellanox python-ryu mlx4-config python/ python-2.7.5 python-django python-gunicorn python-setuptools python-smartpm python-voluptuous security/ shim-signed shim-unsigned tboot strorage-drivers/ python-3parclient python-lefthandclient virt/ cloud-init libvirt libvirt-python qemu tools/ storage-topology vm-topology utilities/ tis-extensions namespace-utils nova-utils update-motd Change-Id: I37ade764d873c701b35eac5881eb40412ba64a86 Story: 2002801 Task: 22687 Signed-off-by: Scott Little <scott.little@windriver.com>
56 lines
1.9 KiB
Diff
56 lines
1.9 KiB
Diff
From 1b9b21d80f85665b29dda49dd52d80058111d811 Mon Sep 17 00:00:00 2001
|
|
Message-Id: <1b9b21d80f85665b29dda49dd52d80058111d811.1528226387.git.Jim.Somerville@windriver.com>
|
|
In-Reply-To: <c8270e79f6b7008fde44b8d5aa6314d8cf89d3ed.1528226387.git.Jim.Somerville@windriver.com>
|
|
References: <c8270e79f6b7008fde44b8d5aa6314d8cf89d3ed.1528226387.git.Jim.Somerville@windriver.com>
|
|
From: Hannes Reinecke <hare@suse.de>
|
|
Date: Mon, 6 Jul 2015 13:07:58 +0200
|
|
Subject: [PATCH 29/32] 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
|
|
|