diff --git a/[refs] b/[refs] index 087e206f9e7a..74dc2f3b4e89 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 43f98747d48195d92c4102c17d7175bf24df1801 +refs/heads/master: 7da5a05dd7b95315af49f724f623bbfdab0f5e4d diff --git a/trunk/drivers/misc/phantom.c b/trunk/drivers/misc/phantom.c index 186162470090..4ce3bdc2f959 100644 --- a/trunk/drivers/misc/phantom.c +++ b/trunk/drivers/misc/phantom.c @@ -399,8 +399,9 @@ static int __devinit phantom_probe(struct pci_dev *pdev, goto err_irq; } - if (IS_ERR(device_create(phantom_class, &pdev->dev, MKDEV(phantom_major, - minor), "phantom%u", minor))) + if (IS_ERR(device_create_drvdata(phantom_class, &pdev->dev, + MKDEV(phantom_major, minor), + NULL, "phantom%u", minor))) dev_err(&pdev->dev, "can't create device\n"); pci_set_drvdata(pdev, pht);