Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752428AbZFHHUH (ORCPT ); Mon, 8 Jun 2009 03:20:07 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751385AbZFHHT6 (ORCPT ); Mon, 8 Jun 2009 03:19:58 -0400 Received: from mail-pz0-f171.google.com ([209.85.222.171]:41688 "EHLO mail-pz0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750924AbZFHHT5 (ORCPT ); Mon, 8 Jun 2009 03:19:57 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject :content-type:content-transfer-encoding; b=p5Lz5OlfY4TFQkk4huT1rn/4EFcwzz1OIIPDDKqK9JPM0xDxLEl2zgP3lkeWn2nmi2 ofQ7JTNOHJ2hu4WnW7hM+3QxNHqSsXrT07mxZzS1YXsOkm0PWHB+HwUq7FqwmBvodnGa vuEJtel6GuQcOFdbluM1nTBmCbF7ucYLkemv0= Message-ID: <4A2CBB99.9080908@gmail.com> Date: Mon, 08 Jun 2009 12:49:53 +0530 From: Pranith Kumar User-Agent: Thunderbird 2.0.0.0 (X11/20070326) MIME-Version: 1.0 To: greg@kroah.com CC: linux-kernel@vger.kernel.org Subject: [TRIVIAL][PATCH 1/1] Fix warning in staging/otus/ioctl.c Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2198 Lines: 68 Hi, This patch fixes the following warning drivers/staging/otus/ioctl.c: In function `usbdrv_wpa_ioctl': drivers/staging/otus/ioctl.c:2269: warning: ISO C90 forbids mixed declarations and code drivers/staging/otus/ioctl.c: In function `usbdrv_ioctl': drivers/staging/otus/ioctl.c:2448: warning: ISO C90 forbids mixed declarations and code Thanks, -- Pranith. Signed-off-by: D Pranith Kumar diff --git a/drivers/staging/otus/ioctl.c b/drivers/staging/otus/ioctl.c index ce04218..5e8bd94 100644 --- a/drivers/staging/otus/ioctl.c +++ b/drivers/staging/otus/ioctl.c @@ -2045,6 +2045,7 @@ int usbdrv_wpa_ioctl(struct net_device *dev, struct athr_wlan_param *zdparm) struct zsKeyInfo keyInfo; struct usbdrv_private *macp = dev->ml_priv; u16_t vapId = 0; + int ii; /* zmw_get_wlan_dev(dev); */ @@ -2168,7 +2169,6 @@ int usbdrv_wpa_ioctl(struct net_device *dev, struct athr_wlan_param *zdparm) /* DUMP key context */ /* #ifdef WPA_DEBUG */ if (keyInfo.keyLength > 0) { - int ii; printk(KERN_WARNING "Otus: Key Context:\n"); for (ii = 0; ii < keyInfo.keyLength; ) { @@ -2266,7 +2266,6 @@ int usbdrv_wpa_ioctl(struct net_device *dev, struct athr_wlan_param *zdparm) /* zfiWlanSetWpaIe(dev, zdparm->u.generic_elem.data, * zdparm->u.generic_elem.len); */ - int ii; u8_t len = zdparm->u.generic_elem.len; u8_t *wpaie = (u8_t *)zdparm->u.generic_elem.data; @@ -2401,7 +2400,7 @@ int usbdrv_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) struct athr_wlan_param zdparm; struct usbdrv_private *macp = dev->ml_priv; - int err = 0; + int err = 0, val = 0; int changed = 0; /* regp = macp->regp; */ @@ -2445,7 +2444,7 @@ int usbdrv_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) err = -EPERM; break; } - int val = *((int *) wrq->u.name); + val = *((int *) wrq->u.name); if ((val < 0) || (val > 2)) { err = -EINVAL; break; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/