diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-04-22 18:38:45 (GMT) |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-04-22 18:38:45 (GMT) |
commit | 24fc484ab2291d242d1d6bfb5ca5b781061a8578 (patch) | |
tree | ea1d38f9ee40fd3b680f030d28b8aebb0f84b789 /drivers/ide/ide-cd.c | |
parent | 2ecf0a57c60dcb588f310d94412118e15c510532 (diff) | |
parent | 83cff839268feb2f31ae7667b9b2b7641dc10575 (diff) | |
download | linux-24fc484ab2291d242d1d6bfb5ca5b781061a8578.tar.xz |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'drivers/ide/ide-cd.c')
-rw-r--r-- | drivers/ide/ide-cd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c index 392a5bd..6736287 100644 --- a/drivers/ide/ide-cd.c +++ b/drivers/ide/ide-cd.c @@ -577,7 +577,7 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive) struct request *rq = hwif->rq; ide_expiry_t *expiry = NULL; int dma_error = 0, dma, thislen, uptodate = 0; - int write = (rq_data_dir(rq) == WRITE) ? 1 : 0, rc, nsectors; + int write = (rq_data_dir(rq) == WRITE) ? 1 : 0, rc = 0, nsectors; int sense = blk_sense_request(rq); unsigned int timeout; u16 len; |