From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH 2/5] drm/i915: fix error path in intel_setup_gmbus() Date: Wed, 10 Feb 2016 10:56:36 +0200 Message-ID: <8760xx0wqj.fsf@intel.com> References: <1455048677-19882-1-git-send-email-linux@rasmusvillemoes.dk> <1455048677-19882-3-git-send-email-linux@rasmusvillemoes.dk> <87mvr9vdbv.fsf@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <87mvr9vdbv.fsf@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Daniel Vetter , David Airlie Cc: intel-gfx@lists.freedesktop.org, Rasmus Villemoes , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org T24gVHVlLCAwOSBGZWIgMjAxNiwgSmFuaSBOaWt1bGEgPGphbmkubmlrdWxhQGxpbnV4LmludGVs LmNvbT4gd3JvdGU6Cj4gT24gVHVlLCAwOSBGZWIgMjAxNiwgUmFzbXVzIFZpbGxlbW9lcyA8bGlu dXhAcmFzbXVzdmlsbGVtb2VzLmRrPiB3cm90ZToKPj4gVGhpcyBmYWlscyB0byB1bmRvIHRoZSBz ZXR1cCBmb3IgcGluPT0wOyBtb3Jlb3Zlciwgc29tZXRoaW5nCj4+IGludGVyZXN0aW5nIGhhcHBl bnMgaWYgdGhlIHNldHVwIGZhaWxlZCBhbHJlYWR5IGF0IHBpbj09MC4KPj4KPj4gU2lnbmVkLW9m Zi1ieTogUmFzbXVzIFZpbGxlbW9lcyA8bGludXhAcmFzbXVzdmlsbGVtb2VzLmRrPgo+PiAtLS0K Pj4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2kyYy5jIHwgMiArLQo+PiAgMSBmaWxlIGNo YW5nZWQsIDEgaW5zZXJ0aW9uKCspLCAxIGRlbGV0aW9uKC0pCj4+Cj4+IGRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9pMmMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2kyYy5jCj4+IGluZGV4IDI1MjU0YjVjMWFjNS4uZGViODI4MmMyNmQ4IDEwMDY0NAo+PiAt LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9pMmMuYwo+PiArKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9pMmMuYwo+PiBAQCAtNjgzLDcgKzY4Myw3IEBAIGludCBpbnRlbF9z ZXR1cF9nbWJ1cyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQo+PiAgCXJldHVybiAwOwo+PiAgCj4+ ICBlcnI6Cj4+IC0Jd2hpbGUgKC0tcGluKSB7Cj4+ICsJd2hpbGUgKHBpbi0tKSB7Cj4+ICAJCWlm ICghaW50ZWxfZ21idXNfaXNfdmFsaWRfcGluKGRldl9wcml2LCBwaW4pKQo+PiAgCQkJY29udGlu dWU7Cj4KPiBSZXZpZXdlZC1ieTogSmFuaSBOaWt1bGEgPGphbmkubmlrdWxhQGludGVsLmNvbT4K PiBGaXhlczogZjg5OWZjNjRjZGE4ICgiZHJtL2k5MTU6IHVzZSBHTUJVUyB0byBtYW5hZ2UgaTJj IGxpbmtzIikKPiBDYzogc3RhYmxlQHZnZXIua2VybmVsLm9yZwoKQW5kIHBpY2tlZCB1cCB0byBk cm0taW50ZWwtbmV4dC1xdWV1ZWQsIHRoYW5rcyBmb3IgdGhlIHBhdGNoLgoKQlIsCkphbmkuCgoK LS0gCkphbmkgTmlrdWxhLCBJbnRlbCBPcGVuIFNvdXJjZSBUZWNobm9sb2d5IENlbnRlcgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFp bGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756346AbcBJI4k (ORCPT ); Wed, 10 Feb 2016 03:56:40 -0500 Received: from mga04.intel.com ([192.55.52.120]:23316 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752221AbcBJI4j (ORCPT ); Wed, 10 Feb 2016 03:56:39 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.22,425,1449561600"; d="scan'208";a="912166556" From: Jani Nikula To: Rasmus Villemoes , Daniel Vetter , David Airlie Cc: Rasmus Villemoes , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 2/5] drm/i915: fix error path in intel_setup_gmbus() In-Reply-To: <87mvr9vdbv.fsf@intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <1455048677-19882-1-git-send-email-linux@rasmusvillemoes.dk> <1455048677-19882-3-git-send-email-linux@rasmusvillemoes.dk> <87mvr9vdbv.fsf@intel.com> User-Agent: Notmuch/0.21+34~g7dd0d52 (http://notmuchmail.org) Emacs/24.4.1 (x86_64-pc-linux-gnu) Date: Wed, 10 Feb 2016 10:56:36 +0200 Message-ID: <8760xx0wqj.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 09 Feb 2016, Jani Nikula wrote: > On Tue, 09 Feb 2016, Rasmus Villemoes wrote: >> This fails to undo the setup for pin==0; moreover, something >> interesting happens if the setup failed already at pin==0. >> >> Signed-off-by: Rasmus Villemoes >> --- >> drivers/gpu/drm/i915/intel_i2c.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/gpu/drm/i915/intel_i2c.c b/drivers/gpu/drm/i915/intel_i2c.c >> index 25254b5c1ac5..deb8282c26d8 100644 >> --- a/drivers/gpu/drm/i915/intel_i2c.c >> +++ b/drivers/gpu/drm/i915/intel_i2c.c >> @@ -683,7 +683,7 @@ int intel_setup_gmbus(struct drm_device *dev) >> return 0; >> >> err: >> - while (--pin) { >> + while (pin--) { >> if (!intel_gmbus_is_valid_pin(dev_priv, pin)) >> continue; > > Reviewed-by: Jani Nikula > Fixes: f899fc64cda8 ("drm/i915: use GMBUS to manage i2c links") > Cc: stable@vger.kernel.org And picked up to drm-intel-next-queued, thanks for the patch. BR, Jani. -- Jani Nikula, Intel Open Source Technology Center