aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMatt Mackall <mpm@selenic.com>2005-07-12 13:58:09 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-12 16:00:58 -0700
commit70d1d47c47c4643af357cb44d0d891c1b765f2ab (patch)
tree6386f119979ea7af51923f374d28a3c2dcf05414 /drivers
parent[PATCH] aacraid: swapped kmalloc args. (diff)
downloadlinux-dev-70d1d47c47c4643af357cb44d0d891c1b765f2ab.tar.xz
linux-dev-70d1d47c47c4643af357cb44d0d891c1b765f2ab.zip
[PATCH] quiet ide-cd warning
This shuts up a potential uninitialized variable warning. Signed-off-by: Matt Mackall <mpm@selenic.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/ide/ide-cd.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index 0a31cfda08a0..74af7e074868 100644
--- a/drivers/ide/ide-cd.c
+++ b/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);