| Message ID | 20200218082858.42994-1-marcel@holtmann.org (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Johan Hedberg |
| Headers | show |
| Series | Bluetooth: hci_h5: Move variable into local scope | expand |
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
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
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;
Signed-off-by: Marcel Holtmann <marcel@holtmann.org> --- drivers/bluetooth/hci_h5.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)