diff options
Diffstat (limited to 'sound/oss/rme96xx.c')
-rw-r--r-- | sound/oss/rme96xx.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sound/oss/rme96xx.c b/sound/oss/rme96xx.c index 76774bbc1436..7609c68a89f4 100644 --- a/sound/oss/rme96xx.c +++ b/sound/oss/rme96xx.c | |||
@@ -807,7 +807,7 @@ static void* busmaster_malloc(int size) { | |||
807 | struct page* page, *last_page; | 807 | struct page* page, *last_page; |
808 | 808 | ||
809 | page = virt_to_page(buf); | 809 | page = virt_to_page(buf); |
810 | last_page = virt_to_page(buf + (1 << pg)); | 810 | last_page = page + (1 << pg); |
811 | DBG(printk("setting reserved bit\n")); | 811 | DBG(printk("setting reserved bit\n")); |
812 | while (page < last_page) { | 812 | while (page < last_page) { |
813 | SetPageReserved(page); | 813 | SetPageReserved(page); |
@@ -1750,9 +1750,7 @@ static unsigned int rme96xx_poll(struct file *file, struct poll_table_struct *wa | |||
1750 | 1750 | ||
1751 | 1751 | ||
1752 | static struct file_operations rme96xx_audio_fops = { | 1752 | static struct file_operations rme96xx_audio_fops = { |
1753 | #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0) | ||
1754 | .owner = THIS_MODULE, | 1753 | .owner = THIS_MODULE, |
1755 | #endif | ||
1756 | .read = rme96xx_read, | 1754 | .read = rme96xx_read, |
1757 | .write = rme96xx_write, | 1755 | .write = rme96xx_write, |
1758 | .poll = rme96xx_poll, | 1756 | .poll = rme96xx_poll, |
@@ -1852,9 +1850,7 @@ static int rme96xx_mixer_release(struct inode *inode, struct file *file) | |||
1852 | } | 1850 | } |
1853 | 1851 | ||
1854 | static /*const*/ struct file_operations rme96xx_mixer_fops = { | 1852 | static /*const*/ struct file_operations rme96xx_mixer_fops = { |
1855 | #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0) | ||
1856 | .owner = THIS_MODULE, | 1853 | .owner = THIS_MODULE, |
1857 | #endif | ||
1858 | .ioctl = rme96xx_mixer_ioctl, | 1854 | .ioctl = rme96xx_mixer_ioctl, |
1859 | .open = rme96xx_mixer_open, | 1855 | .open = rme96xx_mixer_open, |
1860 | .release = rme96xx_mixer_release, | 1856 | .release = rme96xx_mixer_release, |