[ARM] 3008/1: the exception table is not read-only

[linux-2.6] / drivers / char / hw_random.c

diff --git a/drivers/char/hw_random.c b/drivers/char/hw_random.c
index 7e6ac14c2450d3201d68c00bccd390686e461dbf..6f673d2de0b1717439e5d908f4ce3e5cb4b85072 100644 (file)
--- a/drivers/char/hw_random.c
+++ b/drivers/char/hw_random.c
@@ -513,10 +513,7 @@ static ssize_t rng_dev_read (struct file *filp, char __user *buf, size_t size,
                        return ret ? : -EAGAIN;
 
                if(need_resched())
-               {
-                       current->state = TASK_INTERRUPTIBLE;
-                       schedule_timeout(1);
-               }
+                       schedule_timeout_interruptible(1);
                else
                        udelay(200);    /* FIXME: We could poll for 250uS ?? */
 
@@ -579,7 +576,7 @@ static int __init rng_init (void)
 
        /* Probe for Intel, AMD RNGs */
        for_each_pci_dev(pdev) {
-               ent = pci_match_device (rng_pci_tbl, pdev);
+               ent = pci_match_id(rng_pci_tbl, pdev);
                if (ent) {
                        rng_ops = &rng_vendor_ops[ent->driver_data];
                        goto match;