* [PATCH] Bluetooth: hci_h5: Move variable into local scope
@ 2020-02-18 8:28 Marcel Holtmann
2020-02-18 10:45 ` Johan Hedberg
0 siblings, 1 reply; 3+ messages in thread
From: Marcel Holtmann @ 2020-02-18 8:28 UTC (permalink / raw)
To: linux-bluetooth
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
---
drivers/bluetooth/hci_h5.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/bluetooth/hci_h5.c b/drivers/bluetooth/hci_h5.c
index 1d8173886852..812a5e975ec1 100644
--- a/drivers/bluetooth/hci_h5.c
+++ b/drivers/bluetooth/hci_h5.c
@@ -786,7 +786,6 @@ static const struct hci_uart_proto h5p = {
static int h5_serdev_probe(struct serdev_device *serdev)
{
- const struct acpi_device_id *match;
struct device *dev = &serdev->dev;
struct h5 *h5;
@@ -801,6 +800,8 @@ static int h5_serdev_probe(struct serdev_device *serdev)
serdev_device_set_drvdata(serdev, h5);
if (has_acpi_companion(dev)) {
+ const struct acpi_device_id *match;
+
match = acpi_match_device(dev->driver->acpi_match_table, dev);
if (!match)
return -ENODEV;
--
2.24.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] Bluetooth: hci_h5: Move variable into local scope
2020-02-18 8:28 [PATCH] Bluetooth: hci_h5: Move variable into local scope Marcel Holtmann
@ 2020-02-18 10:45 ` Johan Hedberg
2020-02-18 14:08 ` Marcel Holtmann
0 siblings, 1 reply; 3+ messages in thread
From: Johan Hedberg @ 2020-02-18 10:45 UTC (permalink / raw)
To: Marcel Holtmann; +Cc: linux-bluetooth
Hi Marcel,
On Tue, Feb 18, 2020, Marcel Holtmann wrote:
> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
> ---
> drivers/bluetooth/hci_h5.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
Applied to bluetooth-next. I went and added a short body to the commit
message as well, since I think we generally require that for kernel
commits.
Johan
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] Bluetooth: hci_h5: Move variable into local scope
2020-02-18 10:45 ` Johan Hedberg
@ 2020-02-18 14:08 ` Marcel Holtmann
0 siblings, 0 replies; 3+ messages in thread
From: Marcel Holtmann @ 2020-02-18 14:08 UTC (permalink / raw)
To: Johan Hedberg; +Cc: linux-bluetooth
Hi Johan,
>> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
>> ---
>> drivers/bluetooth/hci_h5.c | 3 ++-
>> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> Applied to bluetooth-next. I went and added a short body to the commit
> message as well, since I think we generally require that for kernel
> commits.
great. Thanks.
I purposely decided to skip that since it was too obvious what this patch was doing.
Regards
Marcel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-02-18 14:08 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-02-18 8:28 [PATCH] Bluetooth: hci_h5: Move variable into local scope Marcel Holtmann
2020-02-18 10:45 ` Johan Hedberg
2020-02-18 14:08 ` Marcel Holtmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox