]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
Bluetooth: hci_bcm: fix build error without CONFIG_PM
authorArnd Bergmann <arnd@arndb.de>
Wed, 11 Oct 2017 13:46:21 +0000 (15:46 +0200)
committerMarcel Holtmann <marcel@holtmann.org>
Wed, 11 Oct 2017 18:09:37 +0000 (20:09 +0200)
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: 8a92056837fd ("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>
drivers/bluetooth/hci_bcm.c

index 16c2eaaaf72bad20ee4cd7304f46615744a6ec18..c69da0e8b79fd90abdccfafef039434d196c91cf 100644 (file)
@@ -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);