diff mbox

saa7146: generate device name early

Message ID 1411421261-9076-1-git-send-email-daniel-gl@gmx.net (mailing list archive)
State New, archived
Headers show

Commit Message

Daniel Glöckner Sept. 22, 2014, 9:27 p.m. UTC 
It is needed when requesting the irq.

Signed-off-by: Daniel Glöckner <daniel-gl@gmx.net>
---
 drivers/media/common/saa7146/saa7146_core.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Thomas Voegtle Sept. 22, 2014, 9:44 p.m. UTC | #1 
On Mon, 22 Sep 2014, Daniel Glöckner wrote:

> It is needed when requesting the irq.
>
> Signed-off-by: Daniel Glöckner <daniel-gl@gmx.net>
> ---
> drivers/media/common/saa7146/saa7146_core.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/media/common/saa7146/saa7146_core.c b/drivers/media/common/saa7146/saa7146_core.c
> index 97afee6..4418119 100644
> --- a/drivers/media/common/saa7146/saa7146_core.c
> +++ b/drivers/media/common/saa7146/saa7146_core.c
> @@ -364,6 +364,9 @@ static int saa7146_init_one(struct pci_dev *pci, const struct pci_device_id *ent
> 		goto out;
> 	}
>
> +	/* create a nice device name */
> +	sprintf(dev->name, "saa7146 (%d)", saa7146_num);
> +
> 	DEB_EE("pci:%p\n", pci);
>
> 	err = pci_enable_device(pci);
> @@ -438,9 +441,6 @@ static int saa7146_init_one(struct pci_dev *pci, const struct pci_device_id *ent
>
> 	/* the rest + print status message */
>
> -	/* create a nice device name */
> -	sprintf(dev->name, "saa7146 (%d)", saa7146_num);
> -
> 	pr_info("found saa7146 @ mem %p (revision %d, irq %d) (0x%04x,0x%04x)\n",
> 		dev->mem, dev->revision, pci->irq,
> 		pci->subsystem_vendor, pci->subsystem_device);
>


No warning anymore, this fixes it for me.

Thank you,

Thomas
diff mbox

Patch

diff --git a/drivers/media/common/saa7146/saa7146_core.c b/drivers/media/common/saa7146/saa7146_core.c
index 97afee6..4418119 100644
--- a/drivers/media/common/saa7146/saa7146_core.c
+++ b/drivers/media/common/saa7146/saa7146_core.c
@@ -364,6 +364,9 @@  static int saa7146_init_one(struct pci_dev *pci, const struct pci_device_id *ent
 		goto out;
 	}
 
+	/* create a nice device name */
+	sprintf(dev->name, "saa7146 (%d)", saa7146_num);
+
 	DEB_EE("pci:%p\n", pci);
 
 	err = pci_enable_device(pci);
@@ -438,9 +441,6 @@  static int saa7146_init_one(struct pci_dev *pci, const struct pci_device_id *ent
 
 	/* the rest + print status message */
 
-	/* create a nice device name */
-	sprintf(dev->name, "saa7146 (%d)", saa7146_num);
-
 	pr_info("found saa7146 @ mem %p (revision %d, irq %d) (0x%04x,0x%04x)\n",
 		dev->mem, dev->revision, pci->irq,
 		pci->subsystem_vendor, pci->subsystem_device);