From: Greg KH <greg@kroah.com>
To: linux-kernel@vger.kernel.org, sensors@stimpy.netroedge.com
Subject: Re: [PATCH] I2C patches for 2.6.10
Date: Fri, 7 Jan 2005 21:39:34 -0800 [thread overview]
Message-ID: <110516277494@kroah.com> (raw)
In-Reply-To: <1105162774832@kroah.com>
ChangeSet 1.1938.439.49, 2005/01/06 15:04:58-08:00, david-b@pacbell.net
[PATCH] I2C: minor isp1301_omap tweaks
Minor cleanups to the isp130_omap driver: enable the right
amount of VBUS current draw in non-OTG configurations; get rid
of a warning from GCC 2.95.3 ("int" function returns no value);
use kcalloc() not kmalloc+memset.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
drivers/i2c/chips/isp1301_omap.c | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff -Nru a/drivers/i2c/chips/isp1301_omap.c b/drivers/i2c/chips/isp1301_omap.c
--- a/drivers/i2c/chips/isp1301_omap.c 2005-01-07 14:54:18 -08:00
+++ b/drivers/i2c/chips/isp1301_omap.c 2005-01-07 14:54:18 -08:00
@@ -934,13 +934,14 @@
static void b_peripheral(struct isp1301 *isp)
{
- enable_vbus_draw(isp, 8);
OTG_CTRL_REG = OTG_CTRL_REG & OTG_XCEIV_OUTPUTS;
usb_gadget_vbus_connect(isp->otg.gadget);
#ifdef CONFIG_USB_OTG
+ enable_vbus_draw(isp, 8);
otg_update_isp(isp);
#else
+ enable_vbus_draw(isp, 100);
/* UDC driver just set OTG_BSESSVLD */
isp1301_set_bits(isp, ISP1301_OTG_CONTROL_1, OTG1_DP_PULLUP);
isp1301_clear_bits(isp, ISP1301_OTG_CONTROL_1, OTG1_DP_PULLDOWN);
@@ -950,7 +951,7 @@
#endif
}
-static int isp_update_otg(struct isp1301 *isp, u8 stat)
+static void isp_update_otg(struct isp1301 *isp, u8 stat)
{
u8 isp_stat, isp_bstat;
enum usb_otg_state state = isp->otg.state;
@@ -1489,11 +1490,9 @@
if (the_transceiver)
return 0;
- isp = kmalloc(sizeof *isp, GFP_KERNEL);
+ isp = kcalloc(1, sizeof *isp, GFP_KERNEL);
if (!isp)
return 0;
-
- memset(isp, 0, sizeof *isp);
INIT_WORK(&isp->work, isp1301_work, isp);
init_timer(&isp->timer);
next prev parent reply other threads:[~2005-01-08 8:51 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-01-08 5:38 [BK PATCH] I2C patches for 2.6.10 Greg KH
2005-01-08 5:39 ` [PATCH] " Greg KH
2005-01-08 5:39 ` Greg KH
2005-01-08 5:39 ` Greg KH
2005-01-08 5:39 ` Greg KH
2005-01-08 5:39 ` Greg KH
2005-01-08 5:39 ` Greg KH [this message]
2005-01-08 5:39 ` Greg KH
2005-01-08 5:39 ` Greg KH
2005-01-08 5:39 ` Greg KH
2005-01-08 5:39 ` Greg KH
2005-01-08 5:39 ` Greg KH
2005-01-08 5:39 ` Greg KH
2005-01-08 5:39 ` Greg KH
2005-01-08 5:39 ` Greg KH
2005-01-08 5:39 ` Greg KH
2005-01-08 5:39 ` Greg KH
2005-01-08 5:39 ` Greg KH
2005-01-08 5:39 ` Greg KH
2005-01-08 5:39 ` Greg KH
2005-01-08 5:39 ` Greg KH
2005-01-08 5:39 ` Greg KH
2005-01-08 5:39 ` Greg KH
2005-01-08 5:39 ` Greg KH
2005-01-08 6:22 ` Mark M. Hoffman
2005-01-08 10:15 ` Jean Delvare
2005-01-08 15:37 ` Greg KH
2005-01-08 19:09 ` [BK PATCH] " Christoph Hellwig
2005-01-08 22:28 ` Greg KH
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=110516277494@kroah.com \
--to=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=sensors@stimpy.netroedge.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).