author: Martin K. Petersen <martin.petersen@oracle.com> 2009-05-22 17:17:50 -0400
committer: Jens Axboe <jens.axboe@oracle.com> 2009-05-22 23:22:54 +0200
commit: ae03bf639a5027d27270123f5f6e3ee6a412781d
parent: e1defc4ff0cf57aca6c5e3ff99fa503f5943c1f1
Commit Summary:
Diffstat:
1 file changed, 2 insertions, 2 deletions
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index cceace61ef28..71d1b9bab70b 100644
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
@@ -2101,8 +2101,8 @@ static int cdrom_read_cdda_bpc(struct cdrom_device_info *cdi, __u8 __user *ubuf,
nr = nframes;
if (cdi->cdda_method == CDDA_BPC_SINGLE)
nr = 1;
- if (nr * CD_FRAMESIZE_RAW > (q->max_sectors << 9))
- nr = (q->max_sectors << 9) / CD_FRAMESIZE_RAW;
+ if (nr * CD_FRAMESIZE_RAW > (queue_max_sectors(q) << 9))
+ nr = (queue_max_sectors(q) << 9) / CD_FRAMESIZE_RAW;
len = nr * CD_FRAMESIZE_RAW;