[PATCH 5/10] nvidiafb: Fix i2c error handling

[PATCH 5/10] nvidiafb: Fix i2c error handling

[Antonino A. Daplas]

  Fixed error handling in rivafb-i2c.c if bus registration fails.

Signed-off-by: Antonino Daplas <adaplas@pol.net>
---

 nv_i2c.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletion(-)

diff -Nru a/drivers/video/nvidia/nv_i2c.c b/drivers/video/nvidia/nv_i2c.c
--- a/drivers/video/nvidia/nv_i2c.c	2005-03-05 00:35:05 +08:00
+++ b/drivers/video/nvidia/nv_i2c.c	2005-03-05 00:45:44 +08:00
@@ -119,9 +119,12 @@
 	if (rc == 0)
 		dev_dbg(&chan->par->pci_dev->dev,
 			"I2C bus %s registered.\n", name);
-	else
+	else {
 		dev_warn(&chan->par->pci_dev->dev,
 			 "Failed to register I2C bus %s.\n", name);
+		chan->par = NULL;
+	}
+
 	return rc;
 }
 
@@ -174,6 +177,9 @@
 		     },
 	};
 	u8 *buf;
+
+	if (!chan->par)
+		return NULL;
 
 	buf = kmalloc(EDID_LENGTH, GFP_KERNEL);
 	if (!buf) {




-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click

Re: [PATCH 5/10] nvidiafb: Fix i2c error handling

[Junio C Hamano]

Could you tell me (and the list) what version of the source tree
these patches are relative to?  I do not think Linux 2.6.11 has
merged nvidiafb yet.

I've been using:

    Message-ID: <200502172045.36673.adaplas@hotpop.com>
    From: "Antonino A. Daplas" <adaplas@hotpop.com>
    Newsgroups: gmane.linux.fbdev.devel
    Subject: [PATCH 6/7] nvidiafb: Add update framebuffer driver for nVidia chipsets
    Date: Thu, 17 Feb 2005 20:45:36 +0800

and I presume the patches you are posting this week are on top
of these but I was not sure hence this question.



-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click

Re: Re: [PATCH 5/10] nvidiafb: Fix i2c error handling

[Antonino A. Daplas]

On Sunday 06 March 2005 09:54, Junio C Hamano wrote:
> Could you tell me (and the list) what version of the source tree
> these patches are relative to?  I do not think Linux 2.6.11 has
> merged nvidiafb yet.

The diff is against 2.6.11-mm1.

Tony




-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click