From: Dan Carpenter <error27@gmail.com>
To: Dan Williams <dcbw@redhat.com>
Cc: "John W. Linville" <linville@tuxdriver.com>,
Ben Hutchings <ben@decadent.org.uk>,
Mike Frysinger <vapier.adi@gmail.com>,
libertas-dev@lists.infradead.org, linux-wireless@vger.kernel.org,
kernel-janitors@vger.kernel.org
Subject: [rfc patch] libertas: fix if_spi_prog_helper_firmware()
Date: Tue, 24 Aug 2010 12:07:43 +0000 [thread overview]
Message-ID: <20100824120743.GG29330@bicker> (raw)
The indenting is not correct here. I don't have this hardware and I'm
just guessing as to what was intended. I think that if there is an
error we should return an error code, but if there isn't an error we
should return success directly without releasing the firmware.
Signed-off-by: Dan Carpenter <error27@gmail.com>
diff --git a/drivers/net/wireless/libertas/if_spi.c b/drivers/net/wireless/libertas/if_spi.c
index fe3f080..123a541 100644
--- a/drivers/net/wireless/libertas/if_spi.c
+++ b/drivers/net/wireless/libertas/if_spi.c
@@ -471,9 +471,12 @@ static int if_spi_prog_helper_firmware(struct if_spi_card *card)
goto release_firmware;
err = spu_write_u16(card, IF_SPI_CARD_INT_CAUSE_REG,
IF_SPI_CIC_CMD_DOWNLOAD_OVER);
+ if (err)
goto release_firmware;
- lbs_deb_spi("waiting for helper to boot...\n");
+ lbs_deb_spi("helper firmware loaded...\n");
+
+ return 0;
release_firmware:
release_firmware(firmware);
WARNING: multiple messages have this Message-ID (diff)
From: Dan Carpenter <error27@gmail.com>
To: Dan Williams <dcbw@redhat.com>
Cc: "John W. Linville" <linville@tuxdriver.com>,
Ben Hutchings <ben@decadent.org.uk>,
Mike Frysinger <vapier.adi@gmail.com>,
libertas-dev@lists.infradead.org, linux-wireless@vger.kernel.org,
kernel-janitors@vger.kernel.org
Subject: [rfc patch] libertas: fix if_spi_prog_helper_firmware()
Date: Tue, 24 Aug 2010 14:07:43 +0200 [thread overview]
Message-ID: <20100824120743.GG29330@bicker> (raw)
The indenting is not correct here. I don't have this hardware and I'm
just guessing as to what was intended. I think that if there is an
error we should return an error code, but if there isn't an error we
should return success directly without releasing the firmware.
Signed-off-by: Dan Carpenter <error27@gmail.com>
diff --git a/drivers/net/wireless/libertas/if_spi.c b/drivers/net/wireless/libertas/if_spi.c
index fe3f080..123a541 100644
--- a/drivers/net/wireless/libertas/if_spi.c
+++ b/drivers/net/wireless/libertas/if_spi.c
@@ -471,9 +471,12 @@ static int if_spi_prog_helper_firmware(struct if_spi_card *card)
goto release_firmware;
err = spu_write_u16(card, IF_SPI_CARD_INT_CAUSE_REG,
IF_SPI_CIC_CMD_DOWNLOAD_OVER);
+ if (err)
goto release_firmware;
- lbs_deb_spi("waiting for helper to boot...\n");
+ lbs_deb_spi("helper firmware loaded...\n");
+
+ return 0;
release_firmware:
release_firmware(firmware);
next reply other threads:[~2010-08-24 12:07 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-24 12:07 Dan Carpenter [this message]
2010-08-24 12:07 ` [rfc patch] libertas: fix if_spi_prog_helper_firmware() Dan Carpenter
2010-08-24 12:15 ` Ben Hutchings
2010-08-24 12:15 ` Ben Hutchings
2010-08-26 3:26 ` Colin McCabe
2010-08-26 3:26 ` Colin McCabe
2010-08-26 3:37 ` Ben Hutchings
2010-08-26 3:37 ` Ben Hutchings
2010-08-26 17:04 ` Colin McCabe
2010-08-26 17:04 ` Colin McCabe
2010-08-24 12:17 ` Johannes Berg
2010-08-24 12:17 ` Johannes Berg
2010-08-26 15:48 ` Dan Williams
2010-08-26 15:48 ` Dan Williams
2010-08-26 18:52 ` Paul Fox
2010-08-26 18:52 ` Paul Fox
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100824120743.GG29330@bicker \
--to=error27@gmail.com \
--cc=ben@decadent.org.uk \
--cc=dcbw@redhat.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=libertas-dev@lists.infradead.org \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=vapier.adi@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.