summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-06-12 20:04:11 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-06-12 20:04:11 +0200
commitc7ca6b0fcfb309dbb3d81dc9315e960f6fb14cb9 (patch)
tree1bda4be861803c48c0716997481ab1d734e58200
parentMerge branch 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6 (diff)
parentide-cd: signedness warning fix again (diff)
downloadlinux-c7ca6b0fcfb309dbb3d81dc9315e960f6fb14cb9.tar.xz
linux-c7ca6b0fcfb309dbb3d81dc9315e960f6fb14cb9.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6: ide-cd: signedness warning fix again
-rw-r--r--drivers/ide/ide-cd.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index 144d27261e43..04b09564bfa9 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -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);