Commit 81a19053 authored Oct 11, 2017 by Arnd Bergmann Committed by Marcel Holtmann Oct 11, 2017

Bluetooth: hci_bcm: fix build error without CONFIG_PM



This was introduced by the rework adding PM support:

drivers/bluetooth/hci_bcm.c: In function 'bcm_device_exists':
drivers/bluetooth/hci_bcm.c:156:22: error: 'struct bcm_device' has no member named 'hu'
  if (device && device->hu && device->hu->serdev)
                      ^~

The pointer is not available otherwise, so I'm enclosing
all references in an #ifdef here.

Fixes: 8a920568 ("Bluetooth: hci_bcm: Add (runtime)pm support to the serdev driver")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

parent 18a39b9a

drivers/bluetooth/hci_bcm.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -152,9 +152,11 @@ static bool bcm_device_exists(struct bcm_device *device)
		{
		struct list_head *p;

		#ifdef CONFIG_PM
		/* Devices using serdev always exist */
		if (device && device->hu && device->hu->serdev)
		return true;
		#endif

		list_for_each(p, &bcm_device_list) {
		struct bcm_device *dev = list_entry(p, struct bcm_device, list);
		@@ -973,7 +975,9 @@ static int bcm_serdev_probe(struct serdev_device *serdev)
		return -ENOMEM;

		bcmdev->dev = &serdev->dev;
		#ifdef CONFIG_PM
		bcmdev->hu = &bcmdev->serdev_hu;
		#endif
		bcmdev->serdev_hu.serdev = serdev;
		serdev_device_set_drvdata(serdev, bcmdev);