From f0b2528d992ee8351136a16e20cacd14824f7cdd Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Tue, 15 Jul 2008 21:21:58 +0200 Subject: [PATCH] --- yaml --- r: 101253 b: refs/heads/master c: f83cbc77b0d5521b4f0f591ede4870316944481a h: refs/heads/master i: 101251: 3e66250bfff4ce2a091fbd3fe63fd38624f6efe5 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/ide-scsi.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 7b4c38f2cace..5a620792ac36 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 794cc6804bb946826b7427d205ac391a5370d361 +refs/heads/master: f83cbc77b0d5521b4f0f591ede4870316944481a diff --git a/trunk/drivers/scsi/ide-scsi.c b/trunk/drivers/scsi/ide-scsi.c index 5b8a1931ac9b..c9fdf60c9dcf 100644 --- a/trunk/drivers/scsi/ide-scsi.c +++ b/trunk/drivers/scsi/ide-scsi.c @@ -629,6 +629,8 @@ static void ide_scsi_remove(ide_drive_t *drive) put_disk(g); ide_scsi_put(scsi); + + drive->scsi = 0; } static int ide_scsi_probe(ide_drive_t *); @@ -969,6 +971,8 @@ static int ide_scsi_probe(ide_drive_t *drive) !(host = scsi_host_alloc(&idescsi_template,sizeof(idescsi_scsi_t)))) return -ENODEV; + drive->scsi = 1; + g = alloc_disk(1 << PARTN_BITS); if (!g) goto out_host_put; @@ -1009,6 +1013,7 @@ static int ide_scsi_probe(ide_drive_t *drive) put_disk(g); out_host_put: + drive->scsi = 0; scsi_host_put(host); return err; }