patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / drivers / pci / proc.c

diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
index fd3c608..81fd72e 100644 (file)
--- a/drivers/pci/proc.c
+++ b/drivers/pci/proc.c
@@ -89,7 +89,7 @@ proc_bus_pci_read(struct file *file, char __user *buf, size_t nbytes, loff_t *pp
        if ((pos & 3) && cnt > 2) {
                unsigned short val;
                pci_read_config_word(dev, pos, &val);
-               __put_user(cpu_to_le16(val), (unsigned short *) buf);
+               __put_user(cpu_to_le16(val), (unsigned short __user *) buf);
                buf += 2;
                pos += 2;
                cnt -= 2;
@@ -98,7 +98,7 @@ proc_bus_pci_read(struct file *file, char __user *buf, size_t nbytes, loff_t *pp
        while (cnt >= 4) {
                unsigned int val;
                pci_read_config_dword(dev, pos, &val);
-               __put_user(cpu_to_le32(val), (unsigned int *) buf);
+               __put_user(cpu_to_le32(val), (unsigned int __user *) buf);
                buf += 4;
                pos += 4;
                cnt -= 4;
@@ -107,7 +107,7 @@ proc_bus_pci_read(struct file *file, char __user *buf, size_t nbytes, loff_t *pp
        if (cnt >= 2) {
                unsigned short val;
                pci_read_config_word(dev, pos, &val);
-               __put_user(cpu_to_le16(val), (unsigned short *) buf);
+               __put_user(cpu_to_le16(val), (unsigned short __user *) buf);
                buf += 2;
                pos += 2;
                cnt -= 2;
@@ -158,7 +158,7 @@ proc_bus_pci_write(struct file *file, const char __user *buf, size_t nbytes, lof
 
        if ((pos & 3) && cnt > 2) {
                unsigned short val;
-               __get_user(val, (unsigned short *) buf);
+               __get_user(val, (unsigned short __user *) buf);
                pci_write_config_word(dev, pos, le16_to_cpu(val));
                buf += 2;
                pos += 2;
@@ -167,7 +167,7 @@ proc_bus_pci_write(struct file *file, const char __user *buf, size_t nbytes, lof
 
        while (cnt >= 4) {
                unsigned int val;
-               __get_user(val, (unsigned int *) buf);
+               __get_user(val, (unsigned int __user *) buf);
                pci_write_config_dword(dev, pos, le32_to_cpu(val));
                buf += 4;
                pos += 4;
@@ -176,7 +176,7 @@ proc_bus_pci_write(struct file *file, const char __user *buf, size_t nbytes, lof
 
        if (cnt >= 2) {
                unsigned short val;
-               __get_user(val, (unsigned short *) buf);
+               __get_user(val, (unsigned short __user *) buf);
                pci_write_config_word(dev, pos, le16_to_cpu(val));
                buf += 2;
                pos += 2;