diff options
Diffstat (limited to 'drivers/ieee1394/dv1394.c')
-rw-r--r-- | drivers/ieee1394/dv1394.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ieee1394/dv1394.c b/drivers/ieee1394/dv1394.c index 68c7a5f07842..4538b0235ca3 100644 --- a/drivers/ieee1394/dv1394.c +++ b/drivers/ieee1394/dv1394.c | |||
@@ -2343,8 +2343,8 @@ static void dv1394_remove_host (struct hpsb_host *host) | |||
2343 | dv1394_un_init(video); | 2343 | dv1394_un_init(video); |
2344 | } while (video != NULL); | 2344 | } while (video != NULL); |
2345 | 2345 | ||
2346 | class_simple_device_remove(MKDEV( | 2346 | class_device_destroy(hpsb_protocol_class, |
2347 | IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_DV1394 * 16 + (id<<2))); | 2347 | MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_DV1394 * 16 + (id<<2))); |
2348 | devfs_remove("ieee1394/dv/host%d/NTSC", id); | 2348 | devfs_remove("ieee1394/dv/host%d/NTSC", id); |
2349 | devfs_remove("ieee1394/dv/host%d/PAL", id); | 2349 | devfs_remove("ieee1394/dv/host%d/PAL", id); |
2350 | devfs_remove("ieee1394/dv/host%d", id); | 2350 | devfs_remove("ieee1394/dv/host%d", id); |
@@ -2361,7 +2361,7 @@ static void dv1394_add_host (struct hpsb_host *host) | |||
2361 | 2361 | ||
2362 | ohci = (struct ti_ohci *)host->hostdata; | 2362 | ohci = (struct ti_ohci *)host->hostdata; |
2363 | 2363 | ||
2364 | class_simple_device_add(hpsb_protocol_class, MKDEV( | 2364 | class_device_create(hpsb_protocol_class, MKDEV( |
2365 | IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_DV1394 * 16 + (id<<2)), | 2365 | IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_DV1394 * 16 + (id<<2)), |
2366 | NULL, "dv1394-%d", id); | 2366 | NULL, "dv1394-%d", id); |
2367 | devfs_mk_dir("ieee1394/dv/host%d", id); | 2367 | devfs_mk_dir("ieee1394/dv/host%d", id); |