aboutsummaryrefslogtreecommitdiff
path: root/drivers/ar6000
diff options
context:
space:
mode:
authormerge <null@invalid>2008-11-30 10:25:47 +0000
committerAndy Green <agreen@pads.home.warmcat.com>2008-11-30 10:25:47 +0000
commitc0e2f69a01a4ea57d37513021233cd7d41f71046 (patch)
treebcce8bd21113b659f0d17a3a0dcc10279ec988c8 /drivers/ar6000
parentb6d34d41617a6315892217a49a62435f928e6ce4 (diff)
MERGE-via-pending-tracking-hist-MERGE-via-stable-tracking-clean-hif-warning-patch
pending-tracking-hist top was MERGE-via-stable-tracking-clean-hif-warning-patch / b8c3cb615a862e2a2167127195ffbd7ff18113dd ... parent commitmessage: From: merge <null@invalid> MERGE-via-stable-tracking-hist-clean-hif-warning-patch stable-tracking-hist top was clean-hif-warning-patch / 37b07c166a3bcc91a2ded54daa14412fbfb7cfd0 ... parent commitmessage: From: Andy Green <andy@openmoko.com> clean-hif-warning.patch Signed-off-by: Andy Green <andy@openmoko.com>
Diffstat (limited to 'drivers/ar6000')
-rw-r--r--drivers/ar6000/hif/hif2.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/ar6000/hif/hif2.c b/drivers/ar6000/hif/hif2.c
index 8d3095ff1c5..c635307e837 100644
--- a/drivers/ar6000/hif/hif2.c
+++ b/drivers/ar6000/hif/hif2.c
@@ -483,6 +483,9 @@ static int sdio_ar6000_probe(struct sdio_func *func,
ret);
goto out_got_irq;
}
+#else
+ if (0) /* avoid warning */
+ goto out_got_irq;
#endif
sdio_release_host(func);
@@ -506,7 +509,6 @@ static int sdio_ar6000_probe(struct sdio_func *func,
out_func_ready:
sdio_claim_host(func);
-/* generates a warning */
out_got_irq:
sdio_release_irq(func);