diff options
Diffstat (limited to 'drivers/ata/sata_sx4.c')
-rw-r--r-- | drivers/ata/sata_sx4.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/ata/sata_sx4.c b/drivers/ata/sata_sx4.c index 232468f2ea90..bedd5188e5b0 100644 --- a/drivers/ata/sata_sx4.c +++ b/drivers/ata/sata_sx4.c | |||
@@ -302,11 +302,6 @@ static int pdc_port_start(struct ata_port *ap) | |||
302 | { | 302 | { |
303 | struct device *dev = ap->host->dev; | 303 | struct device *dev = ap->host->dev; |
304 | struct pdc_port_priv *pp; | 304 | struct pdc_port_priv *pp; |
305 | int rc; | ||
306 | |||
307 | rc = ata_port_start(ap); | ||
308 | if (rc) | ||
309 | return rc; | ||
310 | 305 | ||
311 | pp = devm_kzalloc(dev, sizeof(*pp), GFP_KERNEL); | 306 | pp = devm_kzalloc(dev, sizeof(*pp), GFP_KERNEL); |
312 | if (!pp) | 307 | if (!pp) |
@@ -840,8 +835,7 @@ static irqreturn_t pdc20621_interrupt(int irq, void *dev_instance) | |||
840 | ap = host->ports[port_no]; | 835 | ap = host->ports[port_no]; |
841 | tmp = mask & (1 << i); | 836 | tmp = mask & (1 << i); |
842 | VPRINTK("seq %u, port_no %u, ap %p, tmp %x\n", i, port_no, ap, tmp); | 837 | VPRINTK("seq %u, port_no %u, ap %p, tmp %x\n", i, port_no, ap, tmp); |
843 | if (tmp && ap && | 838 | if (tmp && ap) { |
844 | !(ap->flags & ATA_FLAG_DISABLED)) { | ||
845 | struct ata_queued_cmd *qc; | 839 | struct ata_queued_cmd *qc; |
846 | 840 | ||
847 | qc = ata_qc_from_tag(ap, ap->link.active_tag); | 841 | qc = ata_qc_from_tag(ap, ap->link.active_tag); |
@@ -927,7 +921,7 @@ static void pdc_error_handler(struct ata_port *ap) | |||
927 | if (!(ap->pflags & ATA_PFLAG_FROZEN)) | 921 | if (!(ap->pflags & ATA_PFLAG_FROZEN)) |
928 | pdc_reset_port(ap); | 922 | pdc_reset_port(ap); |
929 | 923 | ||
930 | ata_std_error_handler(ap); | 924 | ata_sff_error_handler(ap); |
931 | } | 925 | } |
932 | 926 | ||
933 | static void pdc_post_internal_cmd(struct ata_queued_cmd *qc) | 927 | static void pdc_post_internal_cmd(struct ata_queued_cmd *qc) |