From da09e2022b92e9ac1ee0ab45e1d1a9456efd36c0 Mon Sep 17 00:00:00 2001
From: Matt Mackall <mpm@selenic.com>
Date: Tue, 12 Jul 2005 13:58:09 -0700
Subject: [PATCH] --- yaml --- r: 4662 b: refs/heads/master c:
 70d1d47c47c4643af357cb44d0d891c1b765f2ab h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/ide/ide-cd.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 7c0493f09968..79907b705202 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4645df1035b34be2d431d6a10b08e1c06bcd3361
+refs/heads/master: 70d1d47c47c4643af357cb44d0d891c1b765f2ab
diff --git a/trunk/drivers/ide/ide-cd.c b/trunk/drivers/ide/ide-cd.c
index 0a31cfda08a0..74af7e074868 100644
--- a/trunk/drivers/ide/ide-cd.c
+++ b/trunk/drivers/ide/ide-cd.c
@@ -431,7 +431,7 @@ void cdrom_analyze_sense_data(ide_drive_t *drive,
 #if VERBOSE_IDE_CD_ERRORS
 	{
 		int i;
-		const char *s;
+		const char *s = "bad sense key!";
 		char buf[80];
 
 		printk ("ATAPI device %s:\n", drive->name);
@@ -446,8 +446,6 @@ void cdrom_analyze_sense_data(ide_drive_t *drive,
 
 		if (sense->sense_key < ARY_LEN(sense_key_texts))
 			s = sense_key_texts[sense->sense_key];
-		else
-			s = "bad sense key!";
 
 		printk("%s -- (Sense key=0x%02x)\n", s, sense->sense_key);