Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae29a185 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
  ide-gd: re-get capacity on revalidate
  tx4938ide: Avoid underflow on calculation of a wait cycle
  tx4938ide: Do not call devm_ioremap for whole 128KB
  tx4938ide: Check minimum cycle time and SHWT range (v2)
  ide: Switch to a common address
  ide-cd: fix DMA alignment regression
parents 0bf82ccc 52ebb438

drivers/ide/alim15x3.c

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *

 *  Copyright (C) 1998-2000 Andre Hedrick (andre@linux-ide.org)

 *  May be copied or modified under the terms of the GNU General Public License

 *  Copyright (C) 2002 Alan Cox <alan@redhat.com>

 *  Copyright (C) 2002 Alan Cox

 *  ALi (now ULi M5228) support by Clear Zhang <Clear.Zhang@ali.com.tw>

 *  Copyright (C) 2007 MontaVista Software, Inc. <source@mvista.com>

 *  Copyright (C) 2007 Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

drivers/ide/hpt366.c

+1 −1
Original line number Diff line number Diff line
@@ -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 <alan@redhat.com>

 *		Alan Cox <alan@lxorguk.ukuu.org.uk>

 *

 * - 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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
 *  Copyright (C) 1994-1998	   Linus Torvalds & authors (see below)

 *  Copyright (C) 1998-2002	   Linux ATA Development

 *				      Andre Hedrick <andre@linux-ide.org>

 *  Copyright (C) 2003		   Red Hat <alan@redhat.com>

 *  Copyright (C) 2003		   Red Hat

 *  Copyright (C) 2003-2005, 2007  Bartlomiej Zolnierkiewicz

 */

drivers/ide/ide-gd.c

+6 −1
Original line number Diff line number Diff line
@@ -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;

}