|
@@ -1879,6 +1879,7 @@ retry:
|
|
switch (class) {
|
|
switch (class) {
|
|
case ATA_DEV_SEMB:
|
|
case ATA_DEV_SEMB:
|
|
class = ATA_DEV_ATA; /* some hard drives report SEMB sig */
|
|
class = ATA_DEV_ATA; /* some hard drives report SEMB sig */
|
|
|
|
+ /* fall through */
|
|
case ATA_DEV_ATA:
|
|
case ATA_DEV_ATA:
|
|
case ATA_DEV_ZAC:
|
|
case ATA_DEV_ZAC:
|
|
tf.command = ATA_CMD_ID_ATA;
|
|
tf.command = ATA_CMD_ID_ATA;
|
|
@@ -2975,6 +2976,7 @@ int ata_bus_probe(struct ata_port *ap)
|
|
case -ENODEV:
|
|
case -ENODEV:
|
|
/* give it just one more chance */
|
|
/* give it just one more chance */
|
|
tries[dev->devno] = min(tries[dev->devno], 1);
|
|
tries[dev->devno] = min(tries[dev->devno], 1);
|
|
|
|
+ /* fall through */
|
|
case -EIO:
|
|
case -EIO:
|
|
if (tries[dev->devno] == 1) {
|
|
if (tries[dev->devno] == 1) {
|
|
/* This is the last chance, better to slow
|
|
/* This is the last chance, better to slow
|
|
@@ -3462,6 +3464,7 @@ int ata_down_xfermask_limit(struct ata_device *dev, unsigned int sel)
|
|
|
|
|
|
case ATA_DNXFER_FORCE_PIO0:
|
|
case ATA_DNXFER_FORCE_PIO0:
|
|
pio_mask &= 1;
|
|
pio_mask &= 1;
|
|
|
|
+ /* fall through */
|
|
case ATA_DNXFER_FORCE_PIO:
|
|
case ATA_DNXFER_FORCE_PIO:
|
|
mwdma_mask = 0;
|
|
mwdma_mask = 0;
|
|
udma_mask = 0;
|
|
udma_mask = 0;
|