From 945910b82a35e365a3fa5b9e3892225978025bdc Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Tue, 9 Dec 2008 11:07:22 +0000 Subject: [PATCH] --- yaml --- r: 141464 b: refs/heads/master c: 719548ef66175bdea228f7b377a4edc259d16ab2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4e644c1d0087..ec74d80c15d0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6742c0af2ef2d8ff70e379ebf8a8541190ff44e6 +refs/heads/master: 719548ef66175bdea228f7b377a4edc259d16ab2 diff --git a/trunk/drivers/staging/comedi/drivers.c b/trunk/drivers/staging/comedi/drivers.c index 7322eb8e2ba9..e14aef2a197a 100644 --- a/trunk/drivers/staging/comedi/drivers.c +++ b/trunk/drivers/staging/comedi/drivers.c @@ -799,8 +799,10 @@ int comedi_auto_config(struct device *hardware_device, const char *board_name, c int retval; unsigned *private_data = NULL; - if (!comedi_autoconfig) - return -ENODEV; + if (!comedi_autoconfig) { + dev_set_drvdata(hardware_device, NULL); + return 0; + } minor = comedi_alloc_board_minor(hardware_device); if(minor < 0) return minor;