From f2a51b5041f01858a0154fb06fc9d7054f94ccbb Mon Sep 17 00:00:00 2001 From: Pali Rohár Date: Wed, 7 Dec 2016 11:38:07 +0100 Subject: disk: Do not fail when empty block device is exported --- src/disk.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/disk.c b/src/disk.c index 11df4af..50dac45 100644 --- a/src/disk.c +++ b/src/disk.c @@ -35,6 +35,7 @@ #include #include #include +#include #endif #include "disk.h" @@ -147,7 +148,8 @@ int disk_open_dev(int maj, int min, int partition, int readonly) { fd = open(blkdev, (readonly ? O_RDONLY : O_RDWR) | O_EXCL); if ( fd < 0 ) { - ERROR_INFO("Cannot open block device %s", blkdev); + if ( errno != ENOMEDIUM ) + ERROR_INFO("Cannot open block device %s", blkdev); return -1; } @@ -371,7 +373,7 @@ int disk_init(struct usb_device_info * dev) { else fd = disk_open_dev(maj1, min1, 1, 1); - if ( fd < 0 ) + if ( fd < 0 && errno != ENOMEDIUM ) return -1; dev->data = fd; -- cgit v1.2.3