[Patch] Fix dead code in cdrom/gscd.c

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



hi,

this fixes Coverity Bugs #21 and #22. In both cases the
do { ... } while (result != 6 || result == 0x0E) just
finishes for result == 6, so the if(result != 6) doesnt
make much sense.

This patch simply removes the if statement, so the logic
stays the same.

Signed-off-by: Eric Sesterhenn <[email protected]>

--- linux-2.6.16-rc5-mm1/drivers/cdrom/gscd.c.orig	2006-03-08 09:56:30.000000000 +0100
+++ linux-2.6.16-rc5-mm1/drivers/cdrom/gscd.c	2006-03-08 09:58:18.000000000 +0100
@@ -695,10 +695,6 @@ static void cmd_read_b(char *pb, int cou
 			result = wait_drv_ready();
 		} while (result != 6 || result == 0x0E);
 
-		if (result != 6) {
-			cmd_end();
-			return;
-		}
 #ifdef GSCD_DEBUG
 		printk("LOC_191 ");
 #endif
@@ -763,11 +759,6 @@ static void cmd_read_w(char *pb, int cou
 			result = wait_drv_ready();
 		} while (result != 6 || result == 0x0E);
 
-		if (result != 6) {
-			cmd_end();
-			return;
-		}
-
 		for (i = 0; i < size; i++) {
 			/* na, hier muss ich noch mal drueber nachdenken */
 			*pb = inw(GSCDPORT(2));


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[Index of Archives]     [Kernel Newbies]     [Netfilter]     [Bugtraq]     [Photo]     [Stuff]     [Gimp]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Video 4 Linux]     [Linux for the blind]     [Linux Resources]
  Powered by Linux