diff --git a/[refs] b/[refs] index 0695abf97e4e..15157002d132 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ffce7a829d913f40678e0ccf2d87a8c2050261a0 +refs/heads/master: 73de76a0a42efa173c29aff32e555ac6de992573 diff --git a/trunk/sound/oss/sb_common.c b/trunk/sound/oss/sb_common.c index 07cbacf63824..77d0e5efda76 100644 --- a/trunk/sound/oss/sb_common.c +++ b/trunk/sound/oss/sb_common.c @@ -1228,7 +1228,8 @@ int probe_sbmpu(struct address_info *hw_config, struct module *owner) } attach_mpu401(hw_config, owner); if (last_sb->irq == -hw_config->irq) - last_sb->midi_irq_cookie=(void *)hw_config->slots[1]; + last_sb->midi_irq_cookie = + (void *)(long) hw_config->slots[1]; return 1; } #endif