diff options
| author | Muthu Kumar <muthu.lkml@gmail.com> | 2012-03-05 14:59:16 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-05 15:49:43 -0800 |
| commit | 9354f1b8e6c55c335d1c4fb10d0ae7a041935240 (patch) | |
| tree | 98854146031952f226db78a5763b7bf28d310cde | |
| parent | 9ce70c0240d01309b34712f87eda4fbfba3c3764 (diff) | |
| download | kernel_goldelico_gta04-9354f1b8e6c55c335d1c4fb10d0ae7a041935240.zip kernel_goldelico_gta04-9354f1b8e6c55c335d1c4fb10d0ae7a041935240.tar.gz kernel_goldelico_gta04-9354f1b8e6c55c335d1c4fb10d0ae7a041935240.tar.bz2 | |
floppy/scsi: fix setting of BIO flags
Fix setting bio flags in drivers (sd_dif/floppy).
Signed-off-by: Muthukumar R <muthur@gmail.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | drivers/block/floppy.c | 2 | ||||
| -rw-r--r-- | drivers/scsi/sd_dif.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c index 9baf11e..744f078 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c @@ -3832,7 +3832,7 @@ static int __floppy_read_block_0(struct block_device *bdev) bio.bi_size = size; bio.bi_bdev = bdev; bio.bi_sector = 0; - bio.bi_flags = BIO_QUIET; + bio.bi_flags = (1 << BIO_QUIET); init_completion(&complete); bio.bi_private = &complete; bio.bi_end_io = floppy_rb0_complete; diff --git a/drivers/scsi/sd_dif.c b/drivers/scsi/sd_dif.c index 0cb39ff..f8fb2d6 100644 --- a/drivers/scsi/sd_dif.c +++ b/drivers/scsi/sd_dif.c @@ -408,7 +408,7 @@ int sd_dif_prepare(struct request *rq, sector_t hw_sector, unsigned int sector_s kunmap_atomic(sdt, KM_USER0); } - bio->bi_flags |= BIO_MAPPED_INTEGRITY; + bio->bi_flags |= (1 << BIO_MAPPED_INTEGRITY); } return 0; |