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
Date: Wed, 5 Aug 2015 13:21:34 -0700 [thread overview]
Message-ID: <20150805202134.GB12131@vmdeb7> (raw)
In-Reply-To: <1438401496-27744-5-git-send-email-coproscefalo@gmail.com>
> @@ -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
next prev parent reply other threads:[~2015-08-05 20:20 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-01 3:58 [PATCH v3 0/5] toshiba_acpi: Refactor *{get, set} and *available functions Azael Avalos
2015-08-01 3:58 ` [PATCH v3 1/5] toshiba_acpi: Change *available functions return type Azael Avalos
2015-08-01 3:58 ` [PATCH v3 2/5] toshiba_acpi: Remove "*not supported" feature prints Azael Avalos
2015-08-05 9:38 ` Darren Hart
2015-08-05 22:15 ` Azael Avalos
2015-08-05 22:22 ` Darren Hart
2015-08-01 3:58 ` [PATCH v3 3/5] toshiba_acpi: Refactor *{get, set} functions return value Azael Avalos
2015-08-01 3:58 ` [PATCH v3 4/5] toshiba_acpi: Remove unnecessary checks and returns in HCI/SCI functions Azael Avalos
2015-08-05 20:21 ` Darren Hart [this message]
2015-08-05 22:23 ` Azael Avalos
2015-08-05 23:21 ` Darren Hart
2015-08-06 16:21 ` Azael Avalos
2015-08-05 23:36 ` Darren Hart
2015-08-01 3:58 ` [PATCH v3 5/5] toshiba_acpi: Bump driver version to 0.23 Azael Avalos
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150805202134.GB12131@vmdeb7 \
--to=dvhart@infradead.org \
--cc=coproscefalo@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=platform-driver-x86@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox