Message ID | 1458509226-24080-1-git-send-email-linux@eikelenboom.it |
---|---|
State | Not Applicable |
Delegated to: | David Miller |
Headers | show |
On Sun, Mar 20, 2016 at 10:27:06PM +0100, Sander Eikelenboom wrote:
> Signed-off-by: Sander Eikelenboom <linux@eikelenboom.it>
Applied to libata/for-4.7.
Thanks.
diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c index 3982054..e13ba72 100644 --- a/drivers/ata/libahci.c +++ b/drivers/ata/libahci.c @@ -2549,8 +2549,8 @@ int ahci_host_activate(struct ata_host *host, struct scsi_host_template *sht) if (hpriv->flags & (AHCI_HFLAG_MULTI_MSI | AHCI_HFLAG_MULTI_MSIX)) { if (hpriv->irq_handler) - dev_warn(host->dev, "both AHCI_HFLAG_MULTI_MSI flag set \ - and custom irq handler implemented\n"); + dev_warn(host->dev, + "both AHCI_HFLAG_MULTI_MSI flag set and custom irq handler implemented\n"); rc = ahci_host_activate_multi_irqs(host, sht); } else {
Signed-off-by: Sander Eikelenboom <linux@eikelenboom.it> --- drivers/ata/libahci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)