From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Mon, 31 Aug 2009 20:57:52 +0000 (-0300)
Subject: V4L/DVB (12613): cx25840: fix determining the firmware name
X-Git-Tag: v2.6.32-rc1~679^2~33
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d81ae243158b0ac8b2c1646d5adcbdf26a260bc;p=pandora-kernel.git

V4L/DVB (12613): cx25840: fix determining the firmware name

Depending on the model there are three different firmwares to choose from.
Unfortunately if a cx23885 is loaded first, then the global firmware name
is overwritten with that firmware and if ivtv is loaded next, then it
tries to load the wrong firmware. In addition, the original approach would
also overwrite any firmware that the user specified explicitly.

Cc: Jarod Wilson <jarod@wilsonet.com>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---

Reading git-diff-tree failed