From edf378a1e2ccb1ab0d0b367a3db5f3fd3da2eec8 Mon Sep 17 00:00:00 2001
From: Mark Buechler <mark.buechler@gmail.com>
Date: Thu, 26 Aug 2010 22:05:53 +0000
Subject: [PATCH] - Fix setting device attributes which have no special create
 attributes. - Don't warn on device attributes already set of not done with
 -set_dev_attr.

git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@2011 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 scstadmin/scstadmin.sysfs/scstadmin | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scstadmin/scstadmin.sysfs/scstadmin b/scstadmin/scstadmin.sysfs/scstadmin
index 9c330e3f9..9741d0898 100755
--- a/scstadmin/scstadmin.sysfs/scstadmin
+++ b/scstadmin/scstadmin.sysfs/scstadmin
@@ -1575,7 +1575,8 @@ sub applyConfigDevices {
 					my $create_attrs = configToAttr($$devices{$device}->{'CREATE_ATTRIBUTES'});
 					my $old_create_attrs = $SCST->deviceAttributes($device);
 
-					if (compareToKeyAttribute($create_attrs, $old_create_attrs)) {
+					if ((scalar keys %{$create_attrs}) &&
+					     compareToKeyAttribute($create_attrs, $old_create_attrs)) {
 						print "-> Device '$device' is configured differently.\n";
 
 						if ($deletions) {
@@ -1589,7 +1590,7 @@ sub applyConfigDevices {
 						}
 					}
 
-					setDeviceAttributes($device, $attributes, $deletions)
+					setDeviceAttributes($device, $attributes, FALSE)
 					  if (scalar keys %{$attributes});
 					next;
 				}