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

Commit b6e94f33 authored by Tejun Heo's avatar Tejun Heo
Browse files

Merge branch 'for-3.19-fixes' of... 

Merge branch 'for-3.19-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata

 into for-3.20

Pull to receive 4aaa7187 ("sata_dwc_460ex: fix resource leak on
error path") so that further cleanup patches can be queued on top.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parents 9d9acda9 4aaa7187

MAINTAINERS

+43 −32
Original line number Diff line number Diff line
@@ -754,13 +754,6 @@ L: linux-media@vger.kernel.org 
S:	Maintained

F:	drivers/media/i2c/aptina-pll.*



ARASAN COMPACT FLASH PATA CONTROLLER

M:	Viresh Kumar <viresh.linux@gmail.com>

L:	linux-ide@vger.kernel.org

S:	Maintained

F:	include/linux/pata_arasan_cf_data.h

F:	drivers/ata/pata_arasan_cf.c



ARC FRAMEBUFFER DRIVER

M:	Jaya Kumar <jayalk@intworks.biz>

S:	Maintained
@@ -5693,6 +5686,49 @@ F: drivers/lguest/ 
F:	include/linux/lguest*.h

F:	tools/lguest/



LIBATA SUBSYSTEM (Serial and Parallel ATA drivers)

M:	Tejun Heo <tj@kernel.org>

L:	linux-ide@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git

S:	Maintained

F:	drivers/ata/

F:	include/linux/ata.h

F:	include/linux/libata.h



LIBATA PATA ARASAN COMPACT FLASH CONTROLLER

M:	Viresh Kumar <viresh.linux@gmail.com>

L:	linux-ide@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git

S:	Maintained

F:	include/linux/pata_arasan_cf_data.h

F:	drivers/ata/pata_arasan_cf.c



LIBATA PATA DRIVERS

M:	Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>

M:	Tejun Heo <tj@kernel.org>

L:	linux-ide@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git

S:	Maintained

F:	drivers/ata/pata_*.c

F:	drivers/ata/ata_generic.c



LIBATA SATA AHCI PLATFORM devices support

M:	Hans de Goede <hdegoede@redhat.com>

M:	Tejun Heo <tj@kernel.org>

L:	linux-ide@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git

S:	Maintained

F:	drivers/ata/ahci_platform.c

F:	drivers/ata/libahci_platform.c

F:	include/linux/ahci_platform.h



LIBATA SATA PROMISE TX2/TX4 CONTROLLER DRIVER

M:	Mikael Pettersson <mikpelinux@gmail.com>

L:	linux-ide@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git

S:	Maintained

F:	drivers/ata/sata_promise.*



LIBLOCKDEP

M:	Sasha Levin <sasha.levin@oracle.com>

S:	Maintained
@@ -7566,12 +7602,6 @@ W: http://wireless.kernel.org/en/users/Drivers/p54 
S:	Obsolete

F:	drivers/net/wireless/prism54/



PROMISE SATA TX2/TX4 CONTROLLER LIBATA DRIVER

M:	Mikael Pettersson <mikpelinux@gmail.com>

L:	linux-ide@vger.kernel.org

S:	Maintained

F:	drivers/ata/sata_promise.*



PS3 NETWORK SUPPORT

M:	Geoff Levand <geoff@infradead.org>

L:	netdev@vger.kernel.org
@@ -8546,25 +8576,6 @@ S: Maintained 
F:	drivers/misc/phantom.c

F:	include/uapi/linux/phantom.h



SERIAL ATA (SATA) SUBSYSTEM

M:	Tejun Heo <tj@kernel.org>

L:	linux-ide@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git

S:	Supported

F:	drivers/ata/

F:	include/linux/ata.h

F:	include/linux/libata.h



SERIAL ATA AHCI PLATFORM devices support

M:	Hans de Goede <hdegoede@redhat.com>

M:	Tejun Heo <tj@kernel.org>

L:	linux-ide@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git

S:	Supported

F:	drivers/ata/ahci_platform.c

F:	drivers/ata/libahci_platform.c

F:	include/linux/ahci_platform.h



SERVER ENGINES 10Gbps iSCSI - BladeEngine 2 DRIVER

M:	Jayamohan Kallickal <jayamohan.kallickal@emulex.com>

L:	linux-scsi@vger.kernel.org

drivers/ata/sata_dwc_460ex.c

+12 −14
Original line number Diff line number Diff line
@@ -797,7 +797,7 @@ static int dma_dwc_init(struct sata_dwc_device *hsdev, int irq) 
	if (err) {

		dev_err(host_pvt.dwc_dev, "%s: dma_request_interrupts returns"

			" %d\n", __func__, err);

		goto error_out;

		return err;

	}



	/* Enabe DMA */
@@ -808,11 +808,6 @@ static int dma_dwc_init(struct sata_dwc_device *hsdev, int irq) 
		sata_dma_regs);



	return 0;



error_out:

	dma_dwc_exit(hsdev);



	return err;

}



static int sata_dwc_scr_read(struct ata_link *link, unsigned int scr, u32 *val)
@@ -1662,7 +1657,7 @@ static int sata_dwc_probe(struct platform_device *ofdev) 
	char *ver = (char *)&versionr;

	u8 *base = NULL;

	int err = 0;

	int irq, rc;

	int irq;

	struct ata_host *host;

	struct ata_port_info pi = sata_dwc_port_info[0];

	const struct ata_port_info *ppi[] = { &pi, NULL };
@@ -1725,7 +1720,7 @@ static int sata_dwc_probe(struct platform_device *ofdev) 
	if (irq == NO_IRQ) {

		dev_err(&ofdev->dev, "no SATA DMA irq\n");

		err = -ENODEV;

		goto error_out;

		goto error_iomap;

	}



	/* Get physical SATA DMA register base address */
@@ -1734,14 +1729,16 @@ static int sata_dwc_probe(struct platform_device *ofdev) 
		dev_err(&ofdev->dev, "ioremap failed for AHBDMA register"

			" address\n");

		err = -ENODEV;

		goto error_out;

		goto error_iomap;

	}



	/* Save dev for later use in dev_xxx() routines */

	host_pvt.dwc_dev = &ofdev->dev;



	/* Initialize AHB DMAC */

	dma_dwc_init(hsdev, irq);

	err = dma_dwc_init(hsdev, irq);

	if (err)

		goto error_dma_iomap;



	/* Enable SATA Interrupts */

	sata_dwc_enable_interrupts(hsdev);
@@ -1759,9 +1756,8 @@ static int sata_dwc_probe(struct platform_device *ofdev) 
	 * device discovery process, invoking our port_start() handler &

	 * error_handler() to execute a dummy Softreset EH session

	 */

	rc = ata_host_activate(host, irq, sata_dwc_isr, 0, &sata_dwc_sht);



	if (rc != 0)

	err = ata_host_activate(host, irq, sata_dwc_isr, 0, &sata_dwc_sht);

	if (err)

		dev_err(&ofdev->dev, "failed to activate host");



	dev_set_drvdata(&ofdev->dev, host);
@@ -1770,7 +1766,8 @@ static int sata_dwc_probe(struct platform_device *ofdev) 
error_out:

	/* Free SATA DMA resources */

	dma_dwc_exit(hsdev);



error_dma_iomap:

	iounmap((void __iomem *)host_pvt.sata_dma_regs);

error_iomap:

	iounmap(base);

error_kmalloc:
@@ -1791,6 +1788,7 @@ static int sata_dwc_remove(struct platform_device *ofdev) 
	/* Free SATA DMA resources */

	dma_dwc_exit(hsdev);



	iounmap((void __iomem *)host_pvt.sata_dma_regs);

	iounmap(hsdev->reg_base);

	kfree(hsdev);

	kfree(host);