aboutsummaryrefslogtreecommitdiff
path: root/arch/linux/common/storage.h
diff options
context:
space:
mode:
authorAgney Lopes Roth Ferraz <agney@debian.org>2007-12-09 05:03:40 -0400
committerSimon Quigley <tsimonq2@ubuntu.com>2017-06-19 14:38:45 -0500
commit18e8f4ab62003cb2e251f1540d083114ad489123 (patch)
tree1685ab16402d10233f81c67aa4ad7cf857246d86 /arch/linux/common/storage.h
parent401ee3a8ee846998cf0fa3ebadcc81cffe1da3ed (diff)
parentee6c3f9b4cf08a276c971dee66e1acdb32b3dff9 (diff)
Import Debian changes 0.4.2.3-1
hardinfo (0.4.2.3-1) unstable; urgency=low * New upstream release.(Closes: #454947)
Diffstat (limited to 'arch/linux/common/storage.h')
-rw-r--r--arch/linux/common/storage.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/linux/common/storage.h b/arch/linux/common/storage.h
index 6700984b..71c206cd 100644
--- a/arch/linux/common/storage.h
+++ b/arch/linux/common/storage.h
@@ -79,9 +79,13 @@ __scan_scsi_devices(void)
model = g_strdup_printf("%s %s", vendor, model + 7);
} else if (!strncmp(buf, "Type: ", 8)) {
- char *p = strstr(buf, "ANSI SCSI revi");
+ char *p;
gchar *type = NULL, *icon = NULL;
+ if (!(p = strstr(buf, "ANSI SCSI revision"))) {
+ p = strstr(buf, "ANSI SCSI revision");
+ }
+
if (p != NULL) {
while (*(--p) == ' ');
*(++p) = 0;
@@ -335,7 +339,7 @@ __scan_ide_devices(void)
g_hash_table_insert(moreinfo, devid, strhash);
g_free(model);
- model = "";
+ model = g_strdup("");
} else
g_free(device);