aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--README2
-rw-r--r--debian/changelog2
-rw-r--r--sg3_utils.spec2
-rw-r--r--src/sg_get_config.c7
5 files changed, 9 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index b5f0ce92..8d2e80bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,9 +2,10 @@ Each utility has its own version number, date of last change and
some description at the top of its ".c" file. All utilities in the main
directory have their own "man" pages. There is also a sg3_utils man page.
-Changelog for sg3_utils-1.26 [20071204]
+Changelog for sg3_utils-1.26 [20071212]
- sg_ses: sync with ses2r19
- sg_get_config: sync with mmc6r01
+ - allow Firmware upgrade feature descriptor be 4 bytes long
- sg_cmds_extra: add vrprotect argument to sg_ll_verify10()
- add sg_ll_get_performance() and sg_ll_set_cd_speed()
- sg_verify: add --vrprotect= option
diff --git a/README b/README
index 2a89ecf5..1e4f8b56 100644
--- a/README
+++ b/README
@@ -327,4 +327,4 @@ See http://www.torque.net/sg/tools.html
Doug Gilbert
-2nd December 2007
+12th December 2007
diff --git a/debian/changelog b/debian/changelog
index 9c1a77a3..3295516e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ sg3-utils (1.26-0.1) unstable; urgency=low
* New upstream version
- -- Doug Gilbert <dgilbert@interlog.com> Sun, 02 DEc 2007 16:00:00 -0500
+ -- Doug Gilbert <dgilbert@interlog.com> Wed, 12 Dec 2007 23:00:00 -0500
sg3-utils (1.25-0.1) unstable; urgency=low
diff --git a/sg3_utils.spec b/sg3_utils.spec
index 2a0d33f9..69174f23 100644
--- a/sg3_utils.spec
+++ b/sg3_utils.spec
@@ -79,7 +79,7 @@ fi
%{_libdir}/*.la
%changelog
-* Sun Dec 02 2007 - dgilbert at interlog dot com
+* Wed Dec 12 2007 - dgilbert at interlog dot com
- sg_get_config sync with mmc6r01, add sg_sat_phy_event
* sg3_utils-1.26
diff --git a/src/sg_get_config.c b/src/sg_get_config.c
index 3c3cbc2c..672a8a55 100644
--- a/src/sg_get_config.c
+++ b/src/sg_get_config.c
@@ -49,7 +49,7 @@
*/
-static char * version_str = "0.31 20071026"; /* mmc6r01 */
+static char * version_str = "0.31 20071212"; /* mmc6r01 */
#define MX_ALLOC_LEN 8192
#define NAME_BUFF_SZ 64
@@ -741,11 +741,12 @@ static void decode_feature(int feature, unsigned char * ucp, int len)
printf(" version=%d, persist=%d, current=%d [0x%x]\n",
((ucp[2] >> 2) & 0xf), !!(ucp[2] & 0x2), !!(ucp[2] & 0x1),
feature);
- if (len < 8) {
+ if (len < 4) {
printf(" additional length [%d] too short\n", len - 4);
break;
}
- printf(" M5=%d\n", !!(ucp[4] & 0x1));
+ if (len < 8)
+ printf(" M5=%d\n", !!(ucp[4] & 0x1));
break;
case 0x105: /* Timeout */
printf(" version=%d, persist=%d, current=%d [0x%x]\n",