diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-17 21:16:55 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-17 21:16:55 -0400 |
| commit | 4b337c5f245b6587ba844ac7bb13c313a2912f7b (patch) | |
| tree | 999c6a6580b76a083c8efb9dabff709d1c49fcd0 /drivers/media/dvb/firewire/firedtv-dvb.c | |
| parent | 492b057c426e4aa747484958e18e9da29003985d (diff) | |
| parent | 3fe0344faf7fdcb158bd5c1a9aec960a8d70c8e8 (diff) | |
Merge commit 'origin/master' into next
Diffstat (limited to 'drivers/media/dvb/firewire/firedtv-dvb.c')
| -rw-r--r-- | drivers/media/dvb/firewire/firedtv-dvb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb/firewire/firedtv-dvb.c b/drivers/media/dvb/firewire/firedtv-dvb.c index 9d308dd32a5c..5742fde79d99 100644 --- a/drivers/media/dvb/firewire/firedtv-dvb.c +++ b/drivers/media/dvb/firewire/firedtv-dvb.c | |||
| @@ -268,7 +268,7 @@ struct firedtv *fdtv_alloc(struct device *dev, | |||
| 268 | if (!fdtv) | 268 | if (!fdtv) |
| 269 | return NULL; | 269 | return NULL; |
| 270 | 270 | ||
| 271 | dev->driver_data = fdtv; | 271 | dev_set_drvdata(dev, fdtv); |
| 272 | fdtv->device = dev; | 272 | fdtv->device = dev; |
| 273 | fdtv->isochannel = -1; | 273 | fdtv->isochannel = -1; |
| 274 | fdtv->voltage = 0xff; | 274 | fdtv->voltage = 0xff; |