rpms/kernel/devel linux-2.6-random-patches.patch,1.12,1.13

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27915

Modified Files:
	linux-2.6-random-patches.patch 
Log Message:
alternative fix


linux-2.6-random-patches.patch:
 linux-2.6.15.noarch/drivers/char/watchdog/machzwd.c        |    3 +--
 linux-2.6.15.noarch/drivers/media/dvb/ttpci/av7110.c       |    2 +-
 linux-2.6.15.noarch/drivers/media/dvb/ttpci/budget-ci.c    |    2 +-
 linux-2.6.15.noarch/drivers/media/dvb/ttpci/budget-patch.c |    2 +-
 linux-2.6.15.noarch/drivers/media/dvb/ttpci/budget.c       |    5 +----
 linux-2.6.16.noarch/drivers/scsi/libata-core.c             |    1 +
 6 files changed, 6 insertions(+), 9 deletions(-)

Index: linux-2.6-random-patches.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-random-patches.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- linux-2.6-random-patches.patch	21 May 2006 00:17:24 -0000	1.12
+++ linux-2.6-random-patches.patch	28 May 2006 22:05:24 -0000	1.13
@@ -70,13 +70,25 @@
  	}
 
 
+#--- linux-2.6.16.noarch/drivers/scsi/libata-core.c~	2006-04-22 18:43:24.000000000 -0500
+#+++ linux-2.6.16.noarch/drivers/scsi/libata-core.c	2006-04-22 18:43:39.000000000 -0500
+#@@ -4288,6 +4288,7 @@ int ata_device_resume(struct ata_port *a
+# {
+# 	if (ap->flags & ATA_FLAG_SUSPENDED) {
+# 		ap->flags &= ~ATA_FLAG_SUSPENDED;
+#+		ata_busy_sleep(ap, ATA_TMOUT_BOOT_QUICK, ATA_TMOUT_BOOT);
+# 		ata_set_mode(ap);
+# 	}
+# 	if (!ata_dev_present(dev))
+
 --- linux-2.6.16.noarch/drivers/scsi/libata-core.c~	2006-04-22 18:43:24.000000000 -0500
 +++ linux-2.6.16.noarch/drivers/scsi/libata-core.c	2006-04-22 18:43:39.000000000 -0500
 @@ -4288,6 +4288,7 @@ int ata_device_resume(struct ata_port *a
  {
  	if (ap->flags & ATA_FLAG_SUSPENDED) {
++		ata_busy_wait(ap, ATA_BUSY | ATA_DRQ, 200000);
  		ap->flags &= ~ATA_FLAG_SUSPENDED;
-+		ata_busy_sleep(ap, ATA_TMOUT_BOOT_QUICK, ATA_TMOUT_BOOT);
  		ata_set_mode(ap);
  	}
  	if (!ata_dev_present(dev))
+