projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull mca-check-psp into release branch
[powerpc.git]
/
drivers
/
scsi
/
sr.c
diff --git
a/drivers/scsi/sr.c
b/drivers/scsi/sr.c
index
ce63fc8
..
d68cea7
100644
(file)
--- a/
drivers/scsi/sr.c
+++ b/
drivers/scsi/sr.c
@@
-326,6
+326,7
@@
static int sr_init_command(struct scsi_cmnd * SCpnt)
return 0;
memcpy(SCpnt->cmnd, rq->cmd, sizeof(SCpnt->cmnd));
return 0;
memcpy(SCpnt->cmnd, rq->cmd, sizeof(SCpnt->cmnd));
+ SCpnt->cmd_len = rq->cmd_len;
if (!rq->data_len)
SCpnt->sc_data_direction = DMA_NONE;
else if (rq_data_dir(rq) == WRITE)
if (!rq->data_len)
SCpnt->sc_data_direction = DMA_NONE;
else if (rq_data_dir(rq) == WRITE)
@@
-359,7
+360,7
@@
static int sr_init_command(struct scsi_cmnd * SCpnt)
}
if (s_size != 512 && s_size != 1024 && s_size != 2048) {
}
if (s_size != 512 && s_size != 1024 && s_size != 2048) {
-
printk("sr:
bad sector size %d\n", s_size);
+
scmd_printk(KERN_ERR, SCpnt, "
bad sector size %d\n", s_size);
return 0;
}
return 0;
}
@@
-384,8
+385,9
@@
static int sr_init_command(struct scsi_cmnd * SCpnt)
size += sg[i].length;
if (size != SCpnt->request_bufflen && SCpnt->use_sg) {
size += sg[i].length;
if (size != SCpnt->request_bufflen && SCpnt->use_sg) {
- printk(KERN_ERR "sr: mismatch count %d, bytes %d\n",
- size, SCpnt->request_bufflen);
+ scmd_printk(KERN_ERR, SCpnt,
+ "mismatch count %d, bytes %d\n",
+ size, SCpnt->request_bufflen);
if (SCpnt->request_bufflen > size)
SCpnt->request_bufflen = SCpnt->bufflen = size;
}
if (SCpnt->request_bufflen > size)
SCpnt->request_bufflen = SCpnt->bufflen = size;
}
@@
-396,7
+398,7
@@
static int sr_init_command(struct scsi_cmnd * SCpnt)
*/
if (((unsigned int)SCpnt->request->sector % (s_size >> 9)) ||
(SCpnt->request_bufflen % s_size)) {
*/
if (((unsigned int)SCpnt->request->sector % (s_size >> 9)) ||
(SCpnt->request_bufflen % s_size)) {
-
printk("sr:
unaligned transfer\n");
+
scmd_printk(KERN_NOTICE, SCpnt, "
unaligned transfer\n");
return 0;
}
return 0;
}
@@
-454,7
+456,7
@@
queue:
static int sr_block_open(struct inode *inode, struct file *file)
{
struct gendisk *disk = inode->i_bdev->bd_disk;
static int sr_block_open(struct inode *inode, struct file *file)
{
struct gendisk *disk = inode->i_bdev->bd_disk;
- struct scsi_cd *cd
= scsi_cd(inode->i_bdev->bd_disk)
;
+ struct scsi_cd *cd;
int ret = 0;
if(!(cd = scsi_cd_get(disk)))
int ret = 0;
if(!(cd = scsi_cd_get(disk)))
@@
-621,10
+623,8
@@
static int sr_probe(struct device *dev)
disk->flags |= GENHD_FL_REMOVABLE;
add_disk(disk);
disk->flags |= GENHD_FL_REMOVABLE;
add_disk(disk);
- printk(KERN_DEBUG
- "Attached scsi CD-ROM %s at scsi%d, channel %d, id %d, lun %d\n",
- cd->cdi.name, sdev->host->host_no, sdev->channel,
- sdev->id, sdev->lun);
+ sdev_printk(KERN_DEBUG, sdev,
+ "Attached scsi CD-ROM %s\n", cd->cdi.name);
return 0;
fail_put:
return 0;
fail_put: