From patchwork Sun May 1 05:29:40 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: hiranotaka@zng.info X-Patchwork-Id: 744912 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p415sDEU013375 for ; Sun, 1 May 2011 05:54:14 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751636Ab1EAFyL (ORCPT ); Sun, 1 May 2011 01:54:11 -0400 Received: from mail1.asahi-net.or.jp ([202.224.39.197]:48521 "EHLO mail1.asahi-net.or.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750901Ab1EAFyJ (ORCPT ); Sun, 1 May 2011 01:54:09 -0400 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Sun, 01 May 2011 05:54:14 +0000 (UTC) X-Greylist: delayed 1463 seconds by postgrey-1.27 at vger.kernel.org; Sun, 01 May 2011 01:54:09 EDT Received: from wei.zng.jp (x077021.dynamic.ppp.asahi-net.or.jp [122.249.77.21]) by mail1.asahi-net.or.jp (Postfix) with ESMTP id 996E0DE5FC; Sun, 1 May 2011 14:29:44 +0900 (JST) Received: from hiranotaka by wei.zng.jp with local (Exim 4.75) (envelope-from ) id 1QGPDx-00018e-Kt; Sun, 01 May 2011 14:29:41 +0900 From: HIRANO Takahito To: linux-media@vger.kernel.org Cc: HIRANO Takahito Subject: [PATCH] Fix panic on loading earth-pt1. Date: Sun, 1 May 2011 14:29:40 +0900 Message-Id: <1304227780-4344-1-git-send-email-hiranotaka@zng.info> X-Mailer: git-send-email 1.7.4.4 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Signed-off-by: HIRANO Takahito --- drivers/media/dvb/pt1/pt1.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/media/dvb/pt1/pt1.c b/drivers/media/dvb/pt1/pt1.c index 0486919..b81df5f 100644 --- a/drivers/media/dvb/pt1/pt1.c +++ b/drivers/media/dvb/pt1/pt1.c @@ -1090,6 +1090,7 @@ pt1_probe(struct pci_dev *pdev, const struct pci_device_id *ent) i2c_adap->algo = &pt1_i2c_algo; i2c_adap->algo_data = NULL; i2c_adap->dev.parent = &pdev->dev; + strcpy(i2c_adap->name, DRIVER_NAME); i2c_set_adapdata(i2c_adap, pt1); ret = i2c_add_adapter(i2c_adap); if (ret < 0) @@ -1156,10 +1157,10 @@ err_pt1_disable_ram: pt1->power = 0; pt1->reset = 1; pt1_update_power(pt1); -err_pt1_cleanup_adapters: - pt1_cleanup_adapters(pt1); err_i2c_del_adapter: i2c_del_adapter(i2c_adap); +err_pt1_cleanup_adapters: + pt1_cleanup_adapters(pt1); err_kfree: pci_set_drvdata(pdev, NULL); kfree(pt1);