Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 31bbb668fbe71a207d38ecd1797f4cd5b8bd710b

Authored by Bartlomiej Zolnierkiewicz
Committed by David S. Miller
1 parent d23f33de3c
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

amd74xx: don't change UDMA settings when programming PIO timings 

Based on libata pata_amd host driver.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 1 changed file with 4 additions and 3 deletions Side-by-side Diff

drivers/ide/amd74xx.c
Diff comments   View file @ 31bbb66
... ... @@ -3,7 +3,7 @@
3 3 * IDE driver for Linux.
4 4 *
5 5 * Copyright (c) 2000-2002 Vojtech Pavlik
6   - * Copyright (c) 2007-2008 Bartlomiej Zolnierkiewicz
  6 + * Copyright (c) 2007-2010 Bartlomiej Zolnierkiewicz
7 7 *
8 8 * Based on the work of:
9 9 * Andre Hedrick
... ... @@ -70,7 +70,8 @@
70 70 default: return;
71 71 }
72 72  
73   - pci_write_config_byte(dev, AMD_UDMA_TIMING + offset + (3 - dn), t);
  73 + if (timing->udma)
  74 + pci_write_config_byte(dev, AMD_UDMA_TIMING + offset + 3 - dn, t);
74 75 }
75 76  
76 77 /*
... ... @@ -340,7 +341,7 @@
340 341 module_init(amd74xx_ide_init);
341 342 module_exit(amd74xx_ide_exit);
342 343  
343   -MODULE_AUTHOR("Vojtech Pavlik");
  344 +MODULE_AUTHOR("Vojtech Pavlik, Bartlomiej Zolnierkiewicz");
344 345 MODULE_DESCRIPTION("AMD PCI IDE driver");
345 346 MODULE_LICENSE("GPL");