]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
ide-cd: signedness warning fix again
authorConnor Hansen <cmdkhh@gmail.com>
Sat, 11 Jun 2011 22:06:48 +0000 (15:06 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 11 Jun 2011 22:06:48 +0000 (15:06 -0700)
One of the legit warnings 'make W=3 drivers/ide/ide-cd.c'
generates is:
drivers/ide/ide-cd.c: In function ide_cd_do_request
drivers/ide/ide-cd.c:828:2: warning: conversion to int from \
unsigned int may change the sign of the result
drivers/ide/ide-cd.c:833:2: warning: conversion to int from \
unsigned int may change the sign of the result

nsectors is declared int, should be unsigned int.

blk_rq_sectors() returns unsigned int, and ide_complete_rq
expects unsigned int as well.  Fixes both warnings.

Signed-off-by: Connor Hansen <cmdkhh@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/ide/ide-cd.c

index 144d27261e43396161f0b0b196cbfc74bdccd285..04b09564bfa902bf84f6a313594112e74a1db2c6 100644 (file)
@@ -778,7 +778,8 @@ static ide_startstop_t ide_cd_do_request(ide_drive_t *drive, struct request *rq,
                                        sector_t block)
 {
        struct ide_cmd cmd;
-       int uptodate = 0, nsectors;
+       int uptodate = 0;
+       unsigned int nsectors;
 
        ide_debug_log(IDE_DBG_RQ, "cmd: 0x%x, block: %llu",
                                  rq->cmd[0], (unsigned long long)block);