summaryrefslogtreecommitdiffstats
path: root/drivers/block/efi-block-io.c
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2022-08-11 13:42:53 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2022-08-11 13:42:53 +0200
commitb33c2913d747d3c55019a1d310427ca2697de6fc (patch)
tree2c10c7948f7c0b3558a739a66dcae0272a24de9c /drivers/block/efi-block-io.c
parente51e8f2a8c6b9ed3491970f2f42dfe90c43d8428 (diff)
parentf9c9651eabe33f0e3690d1230b9a431d0e3e5706 (diff)
downloadbarebox-b33c2913d747d3c55019a1d310427ca2697de6fc.tar.gz
barebox-b33c2913d747d3c55019a1d310427ca2697de6fc.tar.xz
Merge branch 'for-next/efi'
Diffstat (limited to 'drivers/block/efi-block-io.c')
-rw-r--r--drivers/block/efi-block-io.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/block/efi-block-io.c b/drivers/block/efi-block-io.c
index 8629f88b5f..b78117d445 100644
--- a/drivers/block/efi-block-io.c
+++ b/drivers/block/efi-block-io.c
@@ -140,7 +140,8 @@ static void efi_bio_print_info(struct device_d *dev)
static bool is_bio_usbdev(struct efi_device *efidev)
{
- return efi_device_has_guid(efidev, EFI_USB_IO_PROTOCOL_GUID);
+ return IS_ENABLED(CONFIG_EFI_BLK_SEPARATE_USBDISK) &&
+ efi_device_has_guid(efidev, EFI_USB_IO_PROTOCOL_GUID);
}
static int efi_bio_probe(struct efi_device *efidev)