ide: remove BUG() from ide_complete_rq()

It is no longer needed so remove it, also while at it dequeue the request
only on blk_end_request() success and make ide_complete_rq() return an error
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <>
parent 89f78b32
......@@ -141,15 +141,17 @@ void ide_complete_cmd(ide_drive_t *drive, struct ide_cmd *cmd, u8 stat, u8 err)
void ide_complete_rq(ide_drive_t *drive, int error)
int ide_complete_rq(ide_drive_t *drive, int error)
ide_hwif_t *hwif = drive->hwif;
struct request *rq = hwif->rq;
int rc;
hwif->rq = NULL;
rc = blk_end_request(rq, error, blk_rq_bytes(rq));
if (rc == 0)
hwif->rq = NULL;
if (unlikely(blk_end_request(rq, error, blk_rq_bytes(rq))))
return rc;
......@@ -1166,7 +1166,7 @@ extern int ide_devset_execute(ide_drive_t *drive,
const struct ide_devset *setting, int arg);
void ide_complete_cmd(ide_drive_t *, struct ide_cmd *, u8, u8);
void ide_complete_rq(ide_drive_t *, int);
int ide_complete_rq(ide_drive_t *, int);
void ide_tf_dump(const char *, struct ide_taskfile *);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment