[PATCH] More BUG_ON conversion
Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de> Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Cc: Bartlomiej Zolnierkiewicz <B.Zolnierkiewicz@elka.pw.edu.pl> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Cc: James Bottomley <James.Bottomley@steeleye.com> Acked-by: "Salyzyn, Mark" <mark_salyzyn@adaptec.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
committed by
Linus Torvalds
parent
78ce89c92b
commit
125e18745f
@@ -600,8 +600,7 @@ static ide_startstop_t idescsi_transfer_pc(ide_drive_t *drive)
|
||||
"issuing a packet command\n");
|
||||
return ide_do_reset (drive);
|
||||
}
|
||||
if (HWGROUP(drive)->handler != NULL)
|
||||
BUG();
|
||||
BUG_ON(HWGROUP(drive)->handler != NULL);
|
||||
/* Set the interrupt routine */
|
||||
ide_set_handler(drive, &idescsi_pc_intr, get_timeout(pc), idescsi_expiry);
|
||||
/* Send the actual packet */
|
||||
@@ -691,8 +690,7 @@ static ide_startstop_t idescsi_issue_pc (ide_drive_t *drive, idescsi_pc_t *pc)
|
||||
set_bit(PC_DMA_OK, &pc->flags);
|
||||
|
||||
if (test_bit(IDESCSI_DRQ_INTERRUPT, &scsi->flags)) {
|
||||
if (HWGROUP(drive)->handler != NULL)
|
||||
BUG();
|
||||
BUG_ON(HWGROUP(drive)->handler != NULL);
|
||||
ide_set_handler(drive, &idescsi_transfer_pc,
|
||||
get_timeout(pc), idescsi_expiry);
|
||||
/* Issue the packet command */
|
||||
|
||||
Reference in New Issue
Block a user