From 0dea0a9daf82894aa524809e37e90e1b7e6b8ff8 Mon Sep 17 00:00:00 2001
From: Helge Deller <deller@gmx.de>
Date: Wed, 22 Apr 2009 20:33:40 +0200
Subject: [PATCH] --- yaml --- r: 143999 b: refs/heads/master c:
 a1f9a89c90b4ac143c5b6054c2a157572b272cd2 h: refs/heads/master i:   143997:
 20f3aec7ea1780416db8d06ada80c71a507b615b   143995:
 6b9d89882e7643d9ec6eea2dc68f4c04b722df27   143991:
 5d08db9f2ae6da6f0205c74a28bf3ef0470a7e43   143983:
 0ba08f6d21641f4103d94ee3920e4bddd33de357   143967:
 a0c1254c80c57d89f848eced980c769253c1098e   143935:
 bab4882468ebee8e17c9229c795753dddbf4a196   143871:
 f9d9a86c9306f488d8e3b3cac5fdb2c2af72a9e4 v: v3

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

diff --git a/[refs] b/[refs]
index 017fe2af0a9f..9b6651cee47f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: db2f38c22ea3f545be3b5772e5f9dc5861b74536
+refs/heads/master: a1f9a89c90b4ac143c5b6054c2a157572b272cd2
diff --git a/trunk/drivers/ide/ide-cd.c b/trunk/drivers/ide/ide-cd.c
index 3aec19d1fdfc..3d4e09969763 100644
--- a/trunk/drivers/ide/ide-cd.c
+++ b/trunk/drivers/ide/ide-cd.c
@@ -609,7 +609,7 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive)
 	struct request *rq = hwif->rq;
 	ide_expiry_t *expiry = NULL;
 	int dma_error = 0, dma, thislen, uptodate = 0;
-	int write = (rq_data_dir(rq) == WRITE) ? 1 : 0, rc, nsectors;
+	int write = (rq_data_dir(rq) == WRITE) ? 1 : 0, rc = 0, nsectors;
 	int sense = blk_sense_request(rq);
 	unsigned int timeout;
 	u16 len;