From c0e2f69a01a4ea57d37513021233cd7d41f71046 Mon Sep 17 00:00:00 2001 From: merge Date: Sun, 30 Nov 2008 10:25:47 +0000 Subject: 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 MERGE-via-stable-tracking-hist-clean-hif-warning-patch stable-tracking-hist top was clean-hif-warning-patch / 37b07c166a3bcc91a2ded54daa14412fbfb7cfd0 ... parent commitmessage: From: Andy Green clean-hif-warning.patch Signed-off-by: Andy Green --- drivers/ar6000/hif/hif2.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'drivers/ar6000') 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); -- cgit v1.2.3