From 0db81a9f4f654d5e1c9671639259e030c4d92c38 Mon Sep 17 00:00:00 2001 From: Wolfram Sang Date: Wed, 29 Jul 2009 14:25:37 +0200 Subject: [PATCH] --- yaml --- r: 161933 b: refs/heads/master c: 889c27744c30eb7a43b68c11e33e679cfafc8cd5 h: refs/heads/master i: 161931: 30f8a5e0cda36312f99c95df452d77b2f0008164 v: v3 --- [refs] | 2 +- trunk/drivers/pcmcia/pcmcia_resource.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 08e7b39ab198..ee6517fee2d3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cb6dbd79628a53e66352387b53b426fa88640bfe +refs/heads/master: 889c27744c30eb7a43b68c11e33e679cfafc8cd5 diff --git a/trunk/drivers/pcmcia/pcmcia_resource.c b/trunk/drivers/pcmcia/pcmcia_resource.c index 8c2db2ac8f8a..d919e96c0afd 100644 --- a/trunk/drivers/pcmcia/pcmcia_resource.c +++ b/trunk/drivers/pcmcia/pcmcia_resource.c @@ -902,7 +902,7 @@ struct pcmcia_cfg_mem { * * pcmcia_loop_config() loops over all configuration options, and calls * the driver-specific conf_check() for each one, checking whether - * it is a valid one. + * it is a valid one. Returns 0 on success or errorcode otherwise. */ int pcmcia_loop_config(struct pcmcia_device *p_dev, int (*conf_check) (struct pcmcia_device *p_dev, @@ -915,7 +915,7 @@ int pcmcia_loop_config(struct pcmcia_device *p_dev, struct pcmcia_cfg_mem *cfg_mem; tuple_t *tuple; - int ret = -ENODEV; + int ret; unsigned int vcc; cfg_mem = kzalloc(sizeof(struct pcmcia_cfg_mem), GFP_KERNEL);