From 03e0b7bbfa84be86dd601b5b08d892cccdac2b10 Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Sun, 12 Feb 2006 15:01:49 +0900 Subject: [PATCH] --- yaml --- r: 21839 b: refs/heads/master c: 06ab78222bd119a0a3d8a1f89997ce902a219703 h: refs/heads/master i: 21837: 4e161fe73589770387b3bc248801fe289979c816 21835: 3b2ccb7df699bf50f4a159a03b2384b8f0677b63 21831: 3dbade61215c2e9990984d011d38f34d5a2ce61e 21823: 453bb2d17996104786cd1e1346dc837f97d197f0 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/libata-core.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 06f97a856352..0232b1ca9241 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bef4a456b8dc8b3638f4d49a25a89e1467da9483 +refs/heads/master: 06ab78222bd119a0a3d8a1f89997ce902a219703 diff --git a/trunk/drivers/scsi/libata-core.c b/trunk/drivers/scsi/libata-core.c index cef85e515c4c..9ddb568267e1 100644 --- a/trunk/drivers/scsi/libata-core.c +++ b/trunk/drivers/scsi/libata-core.c @@ -1142,8 +1142,11 @@ static int ata_bus_probe(struct ata_port *ap) rc = ap->ops->probe_reset(ap, classes); if (rc == 0) { - for (i = 0; i < ATA_MAX_DEVICES; i++) + for (i = 0; i < ATA_MAX_DEVICES; i++) { + if (classes[i] == ATA_DEV_UNKNOWN) + classes[i] = ATA_DEV_NONE; ap->device[i].class = classes[i]; + } } else { printk(KERN_ERR "ata%u: probe reset failed, " "disabling port\n", ap->id);