From patchwork Sun Jan 16 00:58:57 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Malcolm Priestley X-Patchwork-Id: 481651 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p0G0xHgo009895 for ; Sun, 16 Jan 2011 00:59:18 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754246Ab1APA7H (ORCPT ); Sat, 15 Jan 2011 19:59:07 -0500 Received: from mail-ww0-f42.google.com ([74.125.82.42]:36224 "EHLO mail-ww0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754220Ab1APA7F (ORCPT ); Sat, 15 Jan 2011 19:59:05 -0500 Received: by wwi17 with SMTP id 17so959984wwi.1 for ; Sat, 15 Jan 2011 16:59:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:subject:from:to:content-type:date:message-id :mime-version:x-mailer:content-transfer-encoding; bh=9u3czC7gWlOqD+WgJCypYJnq7JkfJuAYubk96IgowNs=; b=uQ34eaxQtmTAyB7Qx+rc3EErpoj7oZ1Jyx85tCwWse1Ud3TVQBRu7TPXX/sLOLZvLO /Y8/aJHKXoRZVLzgaVJZWqgjefRfCiNQ1ExXvqXmrz0rqLeaZSN9TbymAbxqcPtZs17D TZ+qZjN+poNwpm2bcCI6rdazEAgc1l46oE05g= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:content-type:date:message-id:mime-version:x-mailer :content-transfer-encoding; b=bXtVdFXyyvw+67xtniY+GCxJW21iUulBuiLss4BMS/SxUoZPcT6PuhAdv0twvNuv6c eMMbZXFpQhyHCbu91kQkPE8+LmVCT/7GeZFHx16S5y6Cwum0EfIO2jZTss87VCey4Dm8 mLhCRx9a5h8gDl4lsAoecZRDV6HF4+RVfup+E= Received: by 10.227.155.75 with SMTP id r11mr2433570wbw.3.1295139543230; Sat, 15 Jan 2011 16:59:03 -0800 (PST) Received: from [10.64.64.65] (92.41.251.231.sub.mbb.three.co.uk [92.41.251.231]) by mx.google.com with ESMTPS id s9sm1566506wby.16.2011.01.15.16.59.01 (version=SSLv3 cipher=RC4-MD5); Sat, 15 Jan 2011 16:59:02 -0800 (PST) Subject: [PATCH][BUG FIX for 2.6.38] DM04/QQBOX memcpy to const char fix. From: Malcolm Priestley To: linux-media@vger.kernel.org Date: Sun, 16 Jan 2011 00:58:57 +0000 Message-ID: <1295139537.28044.20.camel@tvboxspy> Mime-Version: 1.0 X-Mailer: Evolution 2.30.3 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Sun, 16 Jan 2011 00:59:18 +0000 (UTC) diff --git a/drivers/media/dvb/dvb-usb/lmedm04.c b/drivers/media/dvb/dvb-usb/lmedm04.c index 9eea418..46ccd01 100644 --- a/drivers/media/dvb/dvb-usb/lmedm04.c +++ b/drivers/media/dvb/dvb-usb/lmedm04.c @@ -659,7 +659,7 @@ static int lme2510_download_firmware(struct usb_device *dev, } /* Default firmware for LME2510C */ -const char lme_firmware[50] = "dvb-usb-lme2510c-s7395.fw"; +char lme_firmware[50] = "dvb-usb-lme2510c-s7395.fw"; static void lme_coldreset(struct usb_device *dev) { @@ -1006,7 +1006,7 @@ static struct dvb_usb_device_properties lme2510c_properties = { .caps = DVB_USB_IS_AN_I2C_ADAPTER, .usb_ctrl = DEVICE_SPECIFIC, .download_firmware = lme2510_download_firmware, - .firmware = lme_firmware, + .firmware = (const char *)&lme_firmware, .size_of_priv = sizeof(struct lme2510_state), .num_adapters = 1, .adapter = { @@ -1109,5 +1109,5 @@ module_exit(lme2510_module_exit); MODULE_AUTHOR("Malcolm Priestley "); MODULE_DESCRIPTION("LME2510(C) DVB-S USB2.0"); -MODULE_VERSION("1.74"); +MODULE_VERSION("1.75"); MODULE_LICENSE("GPL");