| cdrom.c (f68ec0c24755e5cdb779be6240925f2175311d84) | cdrom.c (a3bce90edd8f6cafe3f63b1a943800792e830178) |
|---|---|
| 1/* linux/drivers/cdrom/cdrom.c 2 Copyright (c) 1996, 1997 David A. van Leeuwen. 3 Copyright (c) 1997, 1998 Erik Andersen <andersee@debian.org> 4 Copyright (c) 1998, 1999 Jens Axboe <axboe@image.dk> 5 6 May be copied or modified under the terms of the GNU General Public 7 License. See linux/COPYING for more information. 8 --- 2083 unchanged lines hidden (view full) --- 2092 nr = nframes; 2093 if (cdi->cdda_method == CDDA_BPC_SINGLE) 2094 nr = 1; 2095 if (nr * CD_FRAMESIZE_RAW > (q->max_sectors << 9)) 2096 nr = (q->max_sectors << 9) / CD_FRAMESIZE_RAW; 2097 2098 len = nr * CD_FRAMESIZE_RAW; 2099 | 1/* linux/drivers/cdrom/cdrom.c 2 Copyright (c) 1996, 1997 David A. van Leeuwen. 3 Copyright (c) 1997, 1998 Erik Andersen <andersee@debian.org> 4 Copyright (c) 1998, 1999 Jens Axboe <axboe@image.dk> 5 6 May be copied or modified under the terms of the GNU General Public 7 License. See linux/COPYING for more information. 8 --- 2083 unchanged lines hidden (view full) --- 2092 nr = nframes; 2093 if (cdi->cdda_method == CDDA_BPC_SINGLE) 2094 nr = 1; 2095 if (nr * CD_FRAMESIZE_RAW > (q->max_sectors << 9)) 2096 nr = (q->max_sectors << 9) / CD_FRAMESIZE_RAW; 2097 2098 len = nr * CD_FRAMESIZE_RAW; 2099 |
| 2100 ret = blk_rq_map_user(q, rq, ubuf, len); | 2100 ret = blk_rq_map_user(q, rq, ubuf, len, GFP_KERNEL); |
| 2101 if (ret) 2102 break; 2103 2104 rq->cmd[0] = GPCMD_READ_CD; 2105 rq->cmd[1] = 1 << 2; 2106 rq->cmd[2] = (lba >> 24) & 0xff; 2107 rq->cmd[3] = (lba >> 16) & 0xff; 2108 rq->cmd[4] = (lba >> 8) & 0xff; --- 1462 unchanged lines hidden --- | 2101 if (ret) 2102 break; 2103 2104 rq->cmd[0] = GPCMD_READ_CD; 2105 rq->cmd[1] = 1 << 2; 2106 rq->cmd[2] = (lba >> 24) & 0xff; 2107 rq->cmd[3] = (lba >> 16) & 0xff; 2108 rq->cmd[4] = (lba >> 8) & 0xff; --- 1462 unchanged lines hidden --- |