Skip to contentSkip to conversation

IDE fixes #1

GIT PULL Bartlomiej Zolnierkiewicz 1 participant 1 message Nov 2, 2008 libata

lore
Share & tools
lore
#0 lore raw

ide-cd DVD burning regression fix (Borislav Petkov), ide-gd media revalidation fix (also from Borislav), fixups for new tx4938ide driver (Atsushi Nemoto) and Alan Cox's email update (from Alan himself).

Linus, please pull from:

master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6.git/

to receive the following updates:

 drivers/ide/alim15x3.c        |    2 +-
 drivers/ide/hpt366.c          |    2 +-
 drivers/ide/ide-cd.c          |    3 ++-
 drivers/ide/ide-disk.c        |    2 +-
 drivers/ide/ide-gd.c          |    7 ++++++-
 drivers/ide/ide-iops.c        |    2 +-
 drivers/ide/ide-pci-generic.c |    2 +-
 drivers/ide/ide-proc.c        |    2 +-
 drivers/ide/it821x.c          |    2 +-
 drivers/ide/jmicron.c         |    2 +-
 drivers/ide/piix.c            |    2 +-
 drivers/ide/scc_pata.c        |    2 +-
 drivers/ide/siimage.c         |    2 +-
 drivers/ide/tx4938ide.c       |   41 +++++++++++++++++++++++++++--------------
 14 files changed, 46 insertions(+), 27 deletions(-)

Alan Cox (1):
ide: Switch to a common address

Atsushi Nemoto (3):
tx4938ide: Check minimum cycle time and SHWT range (v2)
tx4938ide: Do not call devm_ioremap for whole 128KB
tx4938ide: Avoid underflow on calculation of a wait cycle

Borislav Petkov (2):
ide-cd: fix DMA alignment regression
ide-gd: re-get capacity on revalidate

drivers/ide/alim15x3.c +1 -1
index daf9dce..e56c7b7 100644
@@ -5,7 +5,7 @@
  *
  *  Copyright (C) 1998-2000 Andre Hedrick ([email protected])
  *  May be copied or modified under the terms of the GNU General Public License
- *  Copyright (C) 2002 Alan Cox <[email protected]>
+ *  Copyright (C) 2002 Alan Cox
  *  ALi (now ULi M5228) support by Clear Zhang <[email protected]>
  *  Copyright (C) 2007 MontaVista Software, Inc. <[email protected]>
  *  Copyright (C) 2007 Bartlomiej Zolnierkiewicz <[email protected]>
drivers/ide/hpt366.c +1 -1
index a7909e9..f5afd46 100644
@@ -52,7 +52,7 @@
  * different clocks on read/write. This requires overloading rw_disk and
  * other deeply crazy things. Thanks to <http://www.hoerstreich.de> for
  * keeping me sane. 
- *		Alan Cox <[email protected]>
+ *		Alan Cox <[email protected]>
  *
  * - fix the clock turnaround code: it was writing to the wrong ports when
  *   called for the secondary channel, caching the current clock mode per-
drivers/ide/ide-cd.c +2 -1
index 48b5eda..42ab6d8 100644
@@ -1250,7 +1250,8 @@ static void cdrom_do_block_pc(ide_drive_t *drive, struct request *rq)
 		 * separate masks.
 		 */
 		alignment = queue_dma_alignment(q) | q->dma_pad_mask;
-		if ((unsigned long)buf & alignment || rq->data_len & alignment
+		if ((unsigned long)buf & alignment
+		    || rq->data_len & q->dma_pad_mask
 		    || object_is_on_stack(buf))
 			drive->dma = 0;
 	}
drivers/ide/ide-disk.c +1 -1
index e5adebe..eb9fac4 100644
@@ -2,7 +2,7 @@
  *  Copyright (C) 1994-1998	   Linus Torvalds & authors (see below)
  *  Copyright (C) 1998-2002	   Linux ATA Development
  *				      Andre Hedrick <[email protected]>
- *  Copyright (C) 2003		   Red Hat <[email protected]>
+ *  Copyright (C) 2003		   Red Hat
  *  Copyright (C) 2003-2005, 2007  Bartlomiej Zolnierkiewicz
  */
 
drivers/ide/ide-gd.c +6 -1
index 7b66628..b8078b3 100644
@@ -281,7 +281,12 @@ static int ide_gd_media_changed(struct gendisk *disk)
 static int ide_gd_revalidate_disk(struct gendisk *disk)
 {
 	struct ide_disk_obj *idkp = ide_drv_g(disk, ide_disk_obj);
-	set_capacity(disk, ide_gd_capacity(idkp->drive));
+	ide_drive_t *drive = idkp->drive;
+
+	if (ide_gd_media_changed(disk))
+		drive->disk_ops->get_capacity(drive);
+
+	set_capacity(disk, ide_gd_capacity(drive));
 	return 0;
 }
 
drivers/ide/ide-iops.c +1 -1
index bb7a1ed..5d6ba14 100644
@@ -1,6 +1,6 @@
 /*
  *  Copyright (C) 2000-2002	Andre Hedrick <[email protected]>
- *  Copyright (C) 2003		Red Hat <[email protected]>
+ *  Copyright (C) 2003		Red Hat
  *
  */
 
drivers/ide/ide-pci-generic.c +1 -1
index 474f96a..bddae2b 100644
@@ -1,6 +1,6 @@
 /*
  *  Copyright (C) 2001-2002	Andre Hedrick <[email protected]>
- *  Portions (C) Copyright 2002  Red Hat Inc <[email protected]>
+ *  Portions (C) Copyright 2002  Red Hat Inc
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
drivers/ide/ide-proc.c +1 -1
index c31d0dd..f3cddd1 100644
@@ -1,6 +1,6 @@
 /*
  *  Copyright (C) 1997-1998	Mark Lord
- *  Copyright (C) 2003		Red Hat <[email protected]>
+ *  Copyright (C) 2003		Red Hat
  *
  *  Some code was moved here from ide.c, see it for original copyrights.
  */
drivers/ide/it821x.c +1 -1
index 995e18b..ef00408 100644
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004		Red Hat <[email protected]>
+ * Copyright (C) 2004		Red Hat
  * Copyright (C) 2007		Bartlomiej Zolnierkiewicz
  *
  *  May be copied or modified under the terms of the GNU General Public License
drivers/ide/jmicron.c +1 -1
index 9a68433..bf2be64 100644
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (C) 2006		Red Hat <[email protected]>
+ * Copyright (C) 2006		Red Hat
  *
  *  May be copied or modified under the terms of the GNU General Public License
  */
drivers/ide/piix.c +1 -1
index d63f9fd..61d2d92 100644
@@ -1,7 +1,7 @@
 /*
  *  Copyright (C) 1998-1999 Andrzej Krzysztofowicz, Author and Maintainer
  *  Copyright (C) 1998-2000 Andre Hedrick <[email protected]>
- *  Copyright (C) 2003 Red Hat Inc <[email protected]>
+ *  Copyright (C) 2003 Red Hat
  *  Copyright (C) 2006-2007 MontaVista Software, Inc. <[email protected]>
  *
  *  May be copied or modified under the terms of the GNU General Public License
drivers/ide/scc_pata.c +1 -1
index f26aa5d..0f48f9d 100644
@@ -5,7 +5,7 @@
  *
  * This code is based on drivers/ide/pci/siimage.c:
  * Copyright (C) 2001-2002	Andre Hedrick <[email protected]>
- * Copyright (C) 2003		Red Hat <[email protected]>
+ * Copyright (C) 2003		Red Hat
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
drivers/ide/siimage.c +1 -1
index c3107df..7d622d2 100644
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2001-2002	Andre Hedrick <[email protected]>
- * Copyright (C) 2003		Red Hat <[email protected]>
+ * Copyright (C) 2003		Red Hat
  * Copyright (C) 2007-2008	MontaVista Software, Inc.
  * Copyright (C) 2007-2008	Bartlomiej Zolnierkiewicz
  *
drivers/ide/tx4938ide.c +27 -14

94 lines not on this page · raw message