Explorar el Código

[PATCH] libata: use ata_dev_disable() in ata_bus_probe()

We may or may not disable a device after ata_dev_configure() fails.
Kill 'not supported, ignoring' message in ata_dev_configure() and use
ata_dev_disable() in ata_bus_probe().

Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Tejun Heo hace 19 años
padre
commit
fcef978f9d
Se han modificado 1 ficheros con 1 adiciones y 3 borrados
  1. 1 3
      drivers/scsi/libata-core.c

+ 1 - 3
drivers/scsi/libata-core.c

@@ -1363,8 +1363,6 @@ static int ata_dev_configure(struct ata_port *ap, struct ata_device *dev,
 	return 0;
 	return 0;
 
 
 err_out_nosup:
 err_out_nosup:
-	printk(KERN_WARNING "ata%u: dev %u not supported, ignoring\n",
-	       ap->id, dev->devno);
 	DPRINTK("EXIT, err\n");
 	DPRINTK("EXIT, err\n");
 	return rc;
 	return rc;
 }
 }
@@ -1431,7 +1429,7 @@ static int ata_bus_probe(struct ata_port *ap)
 		}
 		}
 
 
 		if (ata_dev_configure(ap, dev, 1)) {
 		if (ata_dev_configure(ap, dev, 1)) {
-			dev->class++;	/* disable device */
+			ata_dev_disable(ap, dev);
 			continue;
 			continue;
 		}
 		}