diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-05 14:18:03 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-05 14:18:03 -0700 |
| commit | e9563355ac1175dd3440dc2ea5c28b27ed51a283 (patch) | |
| tree | 8546d55832714b5d19ba4c7799266918ca04882e /drivers/staging/cx25821 | |
| parent | cdd854bc42b5e6c79bbbc40c6600d995ffe6e747 (diff) | |
| parent | b12d1995f650e92f26184afd28e6cf40bf64467a (diff) | |
Staging: Merge staging-next into Linus's tree
Conflicts:
drivers/staging/Kconfig
drivers/staging/batman-adv/bat_sysfs.c
drivers/staging/batman-adv/device.c
drivers/staging/batman-adv/hard-interface.c
drivers/staging/cx25821/cx25821-audups11.c
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/cx25821')
| -rw-r--r-- | drivers/staging/cx25821/cx25821-alsa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/cx25821/cx25821-alsa.c b/drivers/staging/cx25821/cx25821-alsa.c index a43b18816fa5..bbe36437ac16 100644 --- a/drivers/staging/cx25821/cx25821-alsa.c +++ b/drivers/staging/cx25821/cx25821-alsa.c @@ -698,7 +698,7 @@ static int cx25821_audio_initdev(struct cx25821_dev *dev) /* Card "creation" */ card->private_free = snd_cx25821_dev_free; - chip = (struct cx25821_audio_dev *) card->private_data; + chip = card->private_data; spin_lock_init(&chip->reg_lock); chip->dev = dev; |