Merge tag 'v2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / staging / crystalhd / crystalhd_lnx.c

diff --git a/drivers/staging/crystalhd/crystalhd_lnx.c b/drivers/staging/crystalhd/crystalhd_lnx.c
index fbb80f09a3d9213f85b8091c965a2c2e5642886d..28c6b8ced424cec2e2f3d54ac495f61fda6941da 100644 (file)
--- a/drivers/staging/crystalhd/crystalhd_lnx.c
+++ b/drivers/staging/crystalhd/crystalhd_lnx.c
@@ -351,6 +351,7 @@ static const struct file_operations chd_dec_fops = {
        .unlocked_ioctl = chd_dec_ioctl,
        .open    = chd_dec_open,
        .release = chd_dec_close,
+       .llseek = noop_llseek,
 };
 
 static int __devinit chd_dec_init_chdev(struct crystalhd_adp *adp)
@@ -570,6 +571,7 @@ static int __devinit chd_dec_pci_probe(struct pci_dev *pdev,
        rc = chd_pci_reserve_mem(pinfo);
        if (rc) {
                BCMLOG_ERR("Failed to setup memory regions.\n");
+               pci_disable_device(pdev);
                return -ENOMEM;
        }