[PATCH] fix amiga and atari floppy driver compile warning

From: Vivek Goyal
Date: Thu Oct 28 2010 - 14:42:51 EST


Geert, my crosstool don't produce warning below. I guess this has to do
something with compiler version.

- Geert noticed following warning during compilation.

drivers/block/amiflop.c:1344: warning: ârqâ may be used uninitialized in
this function
drivers/block/ataflop.c:1402: warning: ârqâ may be used uninitialized in
this function

- Initialize rq to NULL to fix the warning. If we can't find a suitable request
to dispatch, this function should return NULL instead of a possibly garbage
pointer.

- Cross compile tested only. Don't have hardware to test it.

Reported-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
Signed-off-by: Vivek Goyal <vgoyal@xxxxxxxxxx>
---
drivers/block/amiflop.c | 2 +-
drivers/block/ataflop.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

Index: linux-2.6/drivers/block/amiflop.c
===================================================================
--- linux-2.6.orig/drivers/block/amiflop.c 2010-10-28 14:32:25.000000000 -0400
+++ linux-2.6/drivers/block/amiflop.c 2010-10-28 14:34:11.000000000 -0400
@@ -1341,7 +1341,7 @@ static struct request *set_next_request(
{
struct request_queue *q;
int cnt = FD_MAX_UNITS;
- struct request *rq;
+ struct request *rq = NULL;

/* Find next queue we can dispatch from */
fdc_queue = fdc_queue + 1;
Index: linux-2.6/drivers/block/ataflop.c
===================================================================
--- linux-2.6.orig/drivers/block/ataflop.c 2010-10-28 14:31:21.000000000 -0400
+++ linux-2.6/drivers/block/ataflop.c 2010-10-28 14:33:58.000000000 -0400
@@ -1399,7 +1399,7 @@ static struct request *set_next_request(
{
struct request_queue *q;
int old_pos = fdc_queue;
- struct request *rq;
+ struct request *rq = NULL;

do {
q = unit[fdc_queue].disk->queue;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/