git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
patch-2_6_7-vs1_9_1_12
[linux-2.6.git]
/
sound
/
oss
/
nm256_audio.c
diff --git
a/sound/oss/nm256_audio.c
b/sound/oss/nm256_audio.c
index
777492c
..
ca763f8
100644
(file)
--- a/
sound/oss/nm256_audio.c
+++ b/
sound/oss/nm256_audio.c
@@
-52,6
+52,7
@@
static int handle_pm_event (struct pm_dev *dev, pm_request_t rqst, void *data);
/* These belong in linux/pci.h. */
#define PCI_DEVICE_ID_NEOMAGIC_NM256AV_AUDIO 0x8005
#define PCI_DEVICE_ID_NEOMAGIC_NM256ZX_AUDIO 0x8006
/* These belong in linux/pci.h. */
#define PCI_DEVICE_ID_NEOMAGIC_NM256AV_AUDIO 0x8005
#define PCI_DEVICE_ID_NEOMAGIC_NM256ZX_AUDIO 0x8006
+#define PCI_DEVICE_ID_NEOMAGIC_NM256XL_PLUS_AUDIO 0x8016
/* List of cards. */
static struct nm256_info *nmcard_list;
/* List of cards. */
static struct nm256_info *nmcard_list;
@@
-928,7
+929,7
@@
nm256_resetAC97 (struct ac97_hwint *dev)
* mixer ioctl to the AC97 driver.
*/
static int
* mixer ioctl to the AC97 driver.
*/
static int
-nm256_default_mixer_ioctl (int dev, unsigned int cmd,
caddr_t
arg)
+nm256_default_mixer_ioctl (int dev, unsigned int cmd,
void __user *
arg)
{
struct nm256_info *card = nm256_find_card_for_mixer (dev);
if (card != NULL)
{
struct nm256_info *card = nm256_find_card_for_mixer (dev);
if (card != NULL)
@@
-1275,6
+1276,8
@@
nm256_probe(struct pci_dev *pcidev,const struct pci_device_id *pciid)
return nm256_install(pcidev, REV_NM256AV, "256AV");
if (pcidev->device == PCI_DEVICE_ID_NEOMAGIC_NM256ZX_AUDIO)
return nm256_install(pcidev, REV_NM256ZX, "256ZX");
return nm256_install(pcidev, REV_NM256AV, "256AV");
if (pcidev->device == PCI_DEVICE_ID_NEOMAGIC_NM256ZX_AUDIO)
return nm256_install(pcidev, REV_NM256ZX, "256ZX");
+ if (pcidev->device == PCI_DEVICE_ID_NEOMAGIC_NM256XL_PLUS_AUDIO)
+ return nm256_install(pcidev, REV_NM256ZX, "256XL+");
return -1; /* should not come here ... */
}
return -1; /* should not come here ... */
}
@@
-1415,7
+1418,7
@@
nm256_audio_close(int dev)
/* Standard ioctl handler. */
static int
/* Standard ioctl handler. */
static int
-nm256_audio_ioctl(int dev, unsigned int cmd,
caddr_t
arg)
+nm256_audio_ioctl(int dev, unsigned int cmd,
void __user *
arg)
{
int ret;
u32 oldinfo;
{
int ret;
u32 oldinfo;
@@
-1439,7
+1442,7
@@
nm256_audio_ioctl(int dev, unsigned int cmd, caddr_t arg)
switch (cmd)
{
case SOUND_PCM_WRITE_RATE:
switch (cmd)
{
case SOUND_PCM_WRITE_RATE:
- if (get_user(ret, (int *) arg))
+ if (get_user(ret, (int
__user
*) arg))
return -EFAULT;
if (ret != 0) {
return -EFAULT;
if (ret != 0) {
@@
-1458,7
+1461,7
@@
nm256_audio_ioctl(int dev, unsigned int cmd, caddr_t arg)
break;
case SNDCTL_DSP_STEREO:
break;
case SNDCTL_DSP_STEREO:
- if (get_user(ret, (int *) arg))
+ if (get_user(ret, (int
__user
*) arg))
return -EFAULT;
card->sinfo[w].stereo = ret ? 1 : 0;
return -EFAULT;
card->sinfo[w].stereo = ret ? 1 : 0;
@@
-1469,7
+1472,7
@@
nm256_audio_ioctl(int dev, unsigned int cmd, caddr_t arg)
break;
case SOUND_PCM_WRITE_CHANNELS:
break;
case SOUND_PCM_WRITE_CHANNELS:
- if (get_user(ret, (int *) arg))
+ if (get_user(ret, (int
__user
*) arg))
return -EFAULT;
if (ret < 1 || ret > 3)
return -EFAULT;
if (ret < 1 || ret > 3)
@@
-1487,7
+1490,7
@@
nm256_audio_ioctl(int dev, unsigned int cmd, caddr_t arg)
break;
case SNDCTL_DSP_SETFMT:
break;
case SNDCTL_DSP_SETFMT:
- if (get_user(ret, (int *) arg))
+ if (get_user(ret, (int
__user
*) arg))
return -EFAULT;
if (ret != 0) {
return -EFAULT;
if (ret != 0) {
@@
-1508,7
+1511,7
@@
nm256_audio_ioctl(int dev, unsigned int cmd, caddr_t arg)
default:
return -EINVAL;
}
default:
return -EINVAL;
}
- return put_user(ret, (int *) arg);
+ return put_user(ret, (int
__user
*) arg);
}
/*
}
/*
@@
-1662,6
+1665,8
@@
static struct pci_device_id nm256_pci_tbl[] = {
PCI_ANY_ID, PCI_ANY_ID, 0, 0},
{PCI_VENDOR_ID_NEOMAGIC, PCI_DEVICE_ID_NEOMAGIC_NM256ZX_AUDIO,
PCI_ANY_ID, PCI_ANY_ID, 0, 0},
PCI_ANY_ID, PCI_ANY_ID, 0, 0},
{PCI_VENDOR_ID_NEOMAGIC, PCI_DEVICE_ID_NEOMAGIC_NM256ZX_AUDIO,
PCI_ANY_ID, PCI_ANY_ID, 0, 0},
+ {PCI_VENDOR_ID_NEOMAGIC, PCI_DEVICE_ID_NEOMAGIC_NM256XL_PLUS_AUDIO,
+ PCI_ANY_ID, PCI_ANY_ID, 0, 0},
{0,}
};
MODULE_DEVICE_TABLE(pci, nm256_pci_tbl);
{0,}
};
MODULE_DEVICE_TABLE(pci, nm256_pci_tbl);