From: Greg Kroah-Hartman <gregkh@suse.de>
To: Linus Torvalds <torvalds@osdl.org>, Andrew Morton <akpm@osdl.org>
Cc: linux-kernel@vger.kernel.org, lm-sensors@lm-sensors.org,
mgreer@mvista.com, khali@linux-fr.org
Subject: [patch 1/4] i2c: Fix i2c-mv64xxx compilation error
Date: Fri, 16 Dec 2005 11:08:43 -0800 [thread overview]
Message-ID: <20051216190843.GB4594@kroah.com> (raw)
In-Reply-To: <20051216190828.GA4594@kroah.com>
[-- Attachment #1: i2c-mv64xxx-compilation-error-fix.patch --]
[-- Type: text/plain, Size: 1272 bytes --]
From: "Mark A. Greer" <mgreer@mvista.com>
The busses/i2c-mv64xxx.c driver doesn't currently compile because of an
incorrect argument to dev_err(). This patch fixes that.
Signed-off-by: Mark A. Greer <mgreer@mvista.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
drivers/i2c/busses/i2c-mv64xxx.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
--- gregkh-2.6.orig/drivers/i2c/busses/i2c-mv64xxx.c
+++ gregkh-2.6/drivers/i2c/busses/i2c-mv64xxx.c
@@ -529,14 +529,15 @@ mv64xxx_i2c_probe(struct platform_device
i2c_set_adapdata(&drv_data->adapter, drv_data);
if (request_irq(drv_data->irq, mv64xxx_i2c_intr, 0,
- MV64XXX_I2C_CTLR_NAME, drv_data)) {
-
- dev_err(dev, "mv64xxx: Can't register intr handler "
- "irq: %d\n", drv_data->irq);
+ MV64XXX_I2C_CTLR_NAME, drv_data)) {
+ dev_err(&drv_data->adapter.dev,
+ "mv64xxx: Can't register intr handler irq: %d\n",
+ drv_data->irq);
rc = -EINVAL;
goto exit_unmap_regs;
} else if ((rc = i2c_add_adapter(&drv_data->adapter)) != 0) {
- dev_err(dev, "mv64xxx: Can't add i2c adapter, rc: %d\n", -rc);
+ dev_err(&drv_data->adapter.dev,
+ "mv64xxx: Can't add i2c adapter, rc: %d\n", -rc);
goto exit_free_irq;
}
--
next prev parent reply other threads:[~2005-12-16 19:10 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20051216185442.633779000@press.kroah.org>
2005-12-16 19:08 ` [patch 0/4] 4 patches for 2.6.15 Greg Kroah-Hartman
2005-12-16 19:08 ` Greg Kroah-Hartman [this message]
2005-12-16 19:08 ` [patch 2/4] PCI express must be initialized before PCI hotplug Greg Kroah-Hartman
2005-12-16 19:08 ` [patch 3/4] PCI: Fix dumb bug in mmconfig fix Greg Kroah-Hartman
2005-12-16 19:09 ` [patch 4/4] UHCI: add missing memory barriers Greg Kroah-Hartman
2005-12-21 22:27 ` [patch 0/2] 2 USB patches for 2.6.15 Greg Kroah-Hartman
2005-12-21 22:28 ` [patch 1/2] USB Storage: Force starget->scsi_level in usb-storage scsiglue.c Greg Kroah-Hartman
2005-12-21 22:28 ` [patch 2/2] usbcore: allow suspend/resume even if drivers don't support it Greg Kroah-Hartman
[not found] <20051212192030.873030000@press.kroah.org>
2005-12-12 20:00 ` [patch 0/4] Small fixes for 2.6.15-rc5 Greg Kroah-Hartman
2005-12-12 20:01 ` [patch 1/4] i2c: Fix i2c-mv64xxx compilation error Greg Kroah-Hartman
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=20051216190843.GB4594@kroah.com \
--to=gregkh@suse.de \
--cc=akpm@osdl.org \
--cc=khali@linux-fr.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lm-sensors@lm-sensors.org \
--cc=mgreer@mvista.com \
--cc=torvalds@osdl.org \
/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).