Skip to content

Commit

Permalink
ide-cd: fix error messages in cdrom_{read,write}_check_ireason()
Browse files Browse the repository at this point in the history
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  • Loading branch information
Bartlomiej Zolnierkiewicz committed Dec 24, 2007
1 parent 05017db commit 35379c0
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions drivers/ide/ide-cd.c
Original file line number Diff line number Diff line change
Expand Up @@ -1068,8 +1068,8 @@ int cdrom_read_check_ireason (ide_drive_t *drive, int len, int ireason)
return 0;
else if (ireason == 0) {
/* Whoops... The drive is expecting to receive data from us! */
printk(KERN_ERR "%s: read_intr: Drive wants to transfer data the "
"wrong way!\n", drive->name);
printk(KERN_ERR "%s: %s: wrong transfer direction!\n",
drive->name, __FUNCTION__);

/* Throw some data at the drive so it doesn't hang
and quit this request. */
Expand All @@ -1086,8 +1086,8 @@ int cdrom_read_check_ireason (ide_drive_t *drive, int len, int ireason)
return 0;
} else {
/* Drive wants a command packet, or invalid ireason... */
printk(KERN_ERR "%s: read_intr: bad interrupt reason %x\n", drive->name,
ireason);
printk(KERN_ERR "%s: %s: bad interrupt reason 0x%02x\n",
drive->name, __FUNCTION__, ireason);
}

cdrom_end_request(drive, 0);
Expand Down Expand Up @@ -1632,8 +1632,8 @@ static int cdrom_write_check_ireason(ide_drive_t *drive, int len, int ireason)
return 0;
else if (ireason == 2) {
/* Whoops... The drive wants to send data. */
printk(KERN_ERR "%s: write_intr: wrong transfer direction!\n",
drive->name);
printk(KERN_ERR "%s: %s: wrong transfer direction!\n",
drive->name, __FUNCTION__);

while (len > 0) {
int dum = 0;
Expand All @@ -1642,8 +1642,8 @@ static int cdrom_write_check_ireason(ide_drive_t *drive, int len, int ireason)
}
} else {
/* Drive wants a command packet, or invalid ireason... */
printk(KERN_ERR "%s: write_intr: bad interrupt reason %x\n",
drive->name, ireason);
printk(KERN_ERR "%s: %s: bad interrupt reason 0x%02x\n",
drive->name, __FUNCTION__, ireason);
}

cdrom_end_request(drive, 0);
Expand Down

0 comments on commit 35379c0

Please sign in to comment.