summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-06-12 11:04:11 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-06-12 11:04:11 -0700
commitc7ca6b0fcfb309dbb3d81dc9315e960f6fb14cb9 (patch)
tree1bda4be861803c48c0716997481ab1d734e58200 /drivers
parent08d63aac436b2ad35d9e864b9ebb05bc8b9bb653 (diff)
parent3307d0d83b7bf636dc6dd2aa4a584d0f52cc185b (diff)
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
Diffstat (limited to 'drivers')
-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);