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

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

Automatic merge of 'misc-fixes' branch from 

	rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
parents 7ce54e3f 7238cfb3

drivers/scsi/ahci.c

+3 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include <linux/delay.h>

#include <linux/interrupt.h>

#include <linux/sched.h>

#include <linux/dma-mapping.h>

#include "scsi.h"

#include <scsi/scsi_host.h>

#include <linux/libata.h>
@@ -289,6 +290,8 @@ static void ahci_host_stop(struct ata_host_set *host_set) 
{

	struct ahci_host_priv *hpriv = host_set->private_data;

	kfree(hpriv);



	ata_host_stop(host_set);

}



static int ahci_port_start(struct ata_port *ap)

drivers/scsi/ata_piix.c

+2 −0
Original line number Diff line number Diff line
@@ -153,6 +153,7 @@ static struct ata_port_operations piix_pata_ops = { 


	.port_start		= ata_port_start,

	.port_stop		= ata_port_stop,

	.host_stop		= ata_host_stop,

};



static struct ata_port_operations piix_sata_ops = {
@@ -180,6 +181,7 @@ static struct ata_port_operations piix_sata_ops = { 


	.port_start		= ata_port_start,

	.port_stop		= ata_port_stop,

	.host_stop		= ata_host_stop,

};



static struct ata_port_info piix_port_info[] = {

drivers/scsi/libata-core.c

+11 −4
Original line number Diff line number Diff line
@@ -3322,6 +3322,13 @@ void ata_port_stop (struct ata_port *ap) 
	dma_free_coherent(dev, ATA_PRD_TBL_SZ, ap->prd, ap->prd_dma);

}



void ata_host_stop (struct ata_host_set *host_set)

{

	if (host_set->mmio_base)

		iounmap(host_set->mmio_base);

}





/**

 *	ata_host_remove - Unregister SCSI host structure with upper layers

 *	@ap: Port to unregister
@@ -3878,10 +3885,6 @@ void ata_pci_remove_one (struct pci_dev *pdev) 
	}



	free_irq(host_set->irq, host_set);

	if (host_set->ops->host_stop)

		host_set->ops->host_stop(host_set);

	if (host_set->mmio_base)

		iounmap(host_set->mmio_base);



	for (i = 0; i < host_set->n_ports; i++) {

		ap = host_set->ports[i];
@@ -3900,6 +3903,9 @@ void ata_pci_remove_one (struct pci_dev *pdev) 
		scsi_host_put(ap->host);

	}



	if (host_set->ops->host_stop)

		host_set->ops->host_stop(host_set);



	kfree(host_set);



	pci_release_regions(pdev);
@@ -3997,6 +4003,7 @@ EXPORT_SYMBOL_GPL(ata_chk_err); 
EXPORT_SYMBOL_GPL(ata_exec_command);

EXPORT_SYMBOL_GPL(ata_port_start);

EXPORT_SYMBOL_GPL(ata_port_stop);

EXPORT_SYMBOL_GPL(ata_host_stop);

EXPORT_SYMBOL_GPL(ata_interrupt);

EXPORT_SYMBOL_GPL(ata_qc_prep);

EXPORT_SYMBOL_GPL(ata_bmdma_setup);

drivers/scsi/libata.h

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
#define __LIBATA_H__



#define DRV_NAME	"libata"

#define DRV_VERSION	"1.10"	/* must be exactly four chars */

#define DRV_VERSION	"1.11"	/* must be exactly four chars */



struct ata_scsi_args {

	u16			*id;

drivers/scsi/sata_nv.c

+2 −0
Original line number Diff line number Diff line
@@ -329,6 +329,8 @@ static void nv_host_stop (struct ata_host_set *host_set) 
		host->host_desc->disable_hotplug(host_set);



	kfree(host);



	ata_host_stop(host_set);

}



static int nv_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)