Date: Wed, 5 Aug 2015 13:21:34 -0700
From: Darren Hart <dvhart@infradead.org>
To: Azael Avalos <coproscefalo@gmail.com>
Cc: platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v3 4/5] toshiba_acpi: Remove unnecessary checks and
 returns in HCI/SCI functions
Message-ID: <20150805202134.GB12131@vmdeb7>
References: <1438401496-27744-1-git-send-email-coproscefalo@gmail.com>
 <1438401496-27744-5-git-send-email-coproscefalo@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1438401496-27744-5-git-send-email-coproscefalo@gmail.com>
User-Agent: Mutt/1.5.23 (2014-03-12)
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1171
Lines: 33

> @@ -1131,14 +1055,10 @@ static int toshiba_usb_three_set(struct toshiba_acpi_dev *dev, u32 state)
>  
>  	result = sci_write(dev, SCI_USB_THREE, state);
>  	sci_close(dev);
> -	if (result == TOS_FAILURE) {
> +	if (result == TOS_FAILURE)
>  		pr_err("ACPI call to set USB 3 failed\n");
> -		return -EIO;
> -	} else if (result == TOS_NOT_SUPPORTED) {
> +	else if (result == TOS_NOT_SUPPORTED)
>  		return -ENODEV;
> -	} else if (result == TOS_INPUT_DATA_ERROR) {
> -		return -EIO;
> -	}
>  
>  	return (result == TOS_SUCCESS || result == TOS_SUCCESS2) 0 : -EIO;

Hrm... the above line cause patch application failure via git (note the
missing ? before the '0 : -EIO;'). This never existed upstream so far as
I can determine.

It applied with some fuzz manually, but I'm concerned about how this
happened.  Did you have a dirty tree when you prepared these patches
perhaps?

-- 
Darren Hart
Intel Open Source Technology Center
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/