diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-12 14:04:11 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-12 14:04:11 -0400 |
| commit | c7ca6b0fcfb309dbb3d81dc9315e960f6fb14cb9 (patch) | |
| tree | 1bda4be861803c48c0716997481ab1d734e58200 /drivers | |
| parent | 08d63aac436b2ad35d9e864b9ebb05bc8b9bb653 (diff) | |
| parent | 3307d0d83b7bf636dc6dd2aa4a584d0f52cc185b (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.c | 3 |
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, | |||
| 778 | sector_t block) | 778 | sector_t block) |
| 779 | { | 779 | { |
| 780 | struct ide_cmd cmd; | 780 | struct ide_cmd cmd; |
| 781 | int uptodate = 0, nsectors; | 781 | int uptodate = 0; |
| 782 | unsigned int nsectors; | ||
| 782 | 783 | ||
| 783 | ide_debug_log(IDE_DBG_RQ, "cmd: 0x%x, block: %llu", | 784 | ide_debug_log(IDE_DBG_RQ, "cmd: 0x%x, block: %llu", |
| 784 | rq->cmd[0], (unsigned long long)block); | 785 | rq->cmd[0], (unsigned long long)block); |